From a021dee64214fcc662c0c36ad4e44dc1deaba65f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 9 Sep 2024 17:28:54 +0200
Subject: [PATCH 01/89] Change labels on thread indicators in web UI (#31806)

---
 app/javascript/mastodon/components/status.jsx | 17 +++----
 .../components/status_thread_label.tsx        | 50 +++++++++++++++++++
 app/javascript/mastodon/locales/en.json       |  2 +
 .../styles/mastodon/components.scss           | 22 ++++++--
 4 files changed, 76 insertions(+), 15 deletions(-)
 create mode 100644 app/javascript/mastodon/components/status_thread_label.tsx

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 7236c9633d..6c32fd245d 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -12,7 +12,6 @@ import { HotKeys } from 'react-hotkeys';
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { ContentWarning } from 'mastodon/components/content_warning';
 import { FilterWarning } from 'mastodon/components/filter_warning';
 import { Icon }  from 'mastodon/components/icon';
@@ -34,6 +33,7 @@ import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
+import { StatusThreadLabel } from './status_thread_label';
 import { VisibilityIcon } from './visibility_icon';
 
 const domParser = new DOMParser();
@@ -413,7 +413,7 @@ class Status extends ImmutablePureComponent {
     if (featured) {
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' icon={PushPinIcon} className='status__prepend-icon' /></div>
+          <div className='status__prepend__icon'><Icon id='thumb-tack' icon={PushPinIcon} /></div>
           <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
         </div>
       );
@@ -422,7 +422,7 @@ class Status extends ImmutablePureComponent {
 
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='retweet' icon={RepeatIcon} className='status__prepend-icon' /></div>
+          <div className='status__prepend__icon'><Icon id='retweet' icon={RepeatIcon} /></div>
           <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
@@ -434,18 +434,13 @@ class Status extends ImmutablePureComponent {
     } else if (status.get('visibility') === 'direct') {
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='at' icon={AlternateEmailIcon} className='status__prepend-icon' /></div>
+          <div className='status__prepend__icon'><Icon id='at' icon={AlternateEmailIcon} /></div>
           <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
         </div>
       );
-    } else if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
-      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
-
+    } else if (showThread && status.get('in_reply_to_id')) {
       prepend = (
-        <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='reply' icon={ReplyIcon} className='status__prepend-icon' /></div>
-          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
-        </div>
+        <StatusThreadLabel accountId={status.getIn(['account', 'id'])} inReplyToAccountId={status.get('in_reply_to_account_id')} />
       );
     }
 
diff --git a/app/javascript/mastodon/components/status_thread_label.tsx b/app/javascript/mastodon/components/status_thread_label.tsx
new file mode 100644
index 0000000000..b18aca6dcb
--- /dev/null
+++ b/app/javascript/mastodon/components/status_thread_label.tsx
@@ -0,0 +1,50 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { Icon } from 'mastodon/components/icon';
+import { DisplayedName } from 'mastodon/features/notifications_v2/components/displayed_name';
+import { useAppSelector } from 'mastodon/store';
+
+export const StatusThreadLabel: React.FC<{
+  accountId: string;
+  inReplyToAccountId: string;
+}> = ({ accountId, inReplyToAccountId }) => {
+  const inReplyToAccount = useAppSelector((state) =>
+    state.accounts.get(inReplyToAccountId),
+  );
+
+  let label;
+
+  if (accountId === inReplyToAccountId) {
+    label = (
+      <FormattedMessage
+        id='status.continued_thread'
+        defaultMessage='Continued thread'
+      />
+    );
+  } else if (inReplyToAccount) {
+    label = (
+      <FormattedMessage
+        id='status.replied_to'
+        defaultMessage='Replied to {name}'
+        values={{ name: <DisplayedName accountIds={[inReplyToAccountId]} /> }}
+      />
+    );
+  } else {
+    label = (
+      <FormattedMessage
+        id='status.replied_in_thread'
+        defaultMessage='Replied in thread'
+      />
+    );
+  }
+
+  return (
+    <div className='status__prepend'>
+      <div className='status__prepend__icon'>
+        <Icon id='reply' icon={ReplyIcon} />
+      </div>
+      {label}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 4321acef4b..7c1d7f126d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
+  "status.continued_thread": "Continued thread",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 0b7c9ac903..92d2034633 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1607,15 +1607,29 @@ body > [data-popper-placement] {
 .status__prepend {
   padding: 16px;
   padding-bottom: 0;
-  display: inline-flex;
-  gap: 10px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
   font-size: 15px;
   line-height: 22px;
   font-weight: 500;
   color: $dark-text-color;
 
-  .status__display-name strong {
-    color: $dark-text-color;
+  &__icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+
+    .icon {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
+  a {
+    color: inherit;
+    text-decoration: none;
   }
 
   > span {

From d0ab94c4d256d8239d0708c5a1e1d694607dae71 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 9 Sep 2024 15:57:19 -0400
Subject: [PATCH 02/89] Add `FeaturedTag` coverage, use `pick` in model
 (#31828)

---
 app/models/featured_tag.rb       |   4 +-
 spec/models/featured_tag_spec.rb | 130 +++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb
index cdd97205eb..a4e7b7cf6f 100644
--- a/app/models/featured_tag.rb
+++ b/app/models/featured_tag.rb
@@ -45,7 +45,7 @@ class FeaturedTag < ApplicationRecord
   end
 
   def decrement(deleted_status_id)
-    update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).select(:created_at).first&.created_at)
+    update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).pick(:created_at))
   end
 
   private
@@ -56,7 +56,7 @@ class FeaturedTag < ApplicationRecord
 
   def reset_data
     self.statuses_count = visible_tagged_account_statuses.count
-    self.last_status_at = visible_tagged_account_statuses.select(:created_at).first&.created_at
+    self.last_status_at = visible_tagged_account_statuses.pick(:created_at)
   end
 
   def validate_featured_tags_limit
diff --git a/spec/models/featured_tag_spec.rb b/spec/models/featured_tag_spec.rb
index 6056e645e0..0f5ead8f97 100644
--- a/spec/models/featured_tag_spec.rb
+++ b/spec/models/featured_tag_spec.rb
@@ -8,4 +8,134 @@ RSpec.describe FeaturedTag do
       it { is_expected.to normalize(:name).from('  #hashtag  ').to('hashtag') }
     end
   end
+
+  describe 'Validations' do
+    context 'when account already has a featured tag' do
+      subject { Fabricate.build :featured_tag, account: account }
+
+      before { Fabricate :featured_tag, account: account, name: 'Test' }
+
+      let(:account) { Fabricate :account }
+
+      it { is_expected.to_not allow_value('Test').for(:name) }
+
+      context 'when account has hit limit' do
+        before { stub_const 'FeaturedTag::LIMIT', 1 }
+
+        context 'with a local account' do
+          let(:account) { Fabricate :account, domain: nil }
+
+          it { is_expected.to_not allow_value(account).for(:account).against(:base).with_message(I18n.t('featured_tags.errors.limit')) }
+        end
+
+        context 'with a remote account' do
+          let(:account) { Fabricate :account, domain: 'host.example' }
+
+          it { is_expected.to allow_value(account).for(:account) }
+        end
+      end
+    end
+  end
+
+  describe 'Callback to set the tag' do
+    context 'with no matching tag' do
+      it 'creates a new tag' do
+        expect { Fabricate :featured_tag, name: 'tag' }
+          .to change(Tag, :count).by(1)
+      end
+    end
+
+    context 'with a matching tag' do
+      it 'creates a new tag' do
+        tag = Fabricate :tag, name: 'tag'
+
+        expect { Fabricate :featured_tag, name: 'tag' }
+          .to_not change(Tag, :count)
+
+        expect(described_class.last.tag)
+          .to eq(tag)
+      end
+    end
+  end
+
+  describe 'Callback to set the stats' do
+    context 'when no statuses are relevant' do
+      it 'sets values to nil' do
+        featured_tag = Fabricate :featured_tag
+
+        expect(featured_tag)
+          .to have_attributes(
+            statuses_count: 0,
+            last_status_at: be_nil
+          )
+      end
+    end
+
+    context 'when some statuses are relevant' do
+      it 'sets values to nil' do
+        tag = Fabricate :tag, name: 'test'
+        status = Fabricate :status, visibility: :public, created_at: 10.days.ago
+        status.tags << tag
+
+        featured_tag = Fabricate :featured_tag, name: 'test', account: status.account
+
+        expect(featured_tag)
+          .to have_attributes(
+            statuses_count: 1,
+            last_status_at: be_within(0.1).of(status.created_at)
+          )
+      end
+    end
+  end
+
+  describe '#sign?' do
+    it { is_expected.to be_sign }
+  end
+
+  describe '#display_name' do
+    subject { Fabricate.build :featured_tag, name: name, tag: tag }
+
+    context 'with a name value present' do
+      let(:name) { 'Test' }
+      let(:tag) { nil }
+
+      it 'uses name value' do
+        expect(subject.display_name).to eq('Test')
+      end
+    end
+
+    context 'with a missing name value but a present tag' do
+      let(:name) { nil }
+      let(:tag) { Fabricate.build :tag, name: 'Tester' }
+
+      it 'uses name value' do
+        expect(subject.display_name).to eq('Tester')
+      end
+    end
+  end
+
+  describe '#increment' do
+    it 'increases the count and updates the last_status_at timestamp' do
+      featured_tag = Fabricate :featured_tag
+      timestamp = 5.days.ago
+
+      expect { featured_tag.increment(timestamp) }
+        .to change(featured_tag, :statuses_count).from(0).to(1)
+        .and change(featured_tag, :last_status_at).from(nil).to(be_within(0.1).of(timestamp))
+    end
+  end
+
+  describe '#decrement' do
+    it 'decreases the count and updates the last_status_at timestamp' do
+      tag = Fabricate :tag, name: 'test'
+      status = Fabricate :status, visibility: :public, created_at: 10.days.ago
+      status.tags << tag
+
+      featured_tag = Fabricate :featured_tag, name: 'test', account: status.account
+
+      expect { featured_tag.decrement(status.id) }
+        .to change(featured_tag, :statuses_count).from(1).to(0)
+        .and change(featured_tag, :last_status_at).to(nil)
+    end
+  end
 end

From 592a7af27f7699d4751d2bea7785149d3c0e5d58 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 9 Sep 2024 21:57:52 +0200
Subject: [PATCH 03/89] =?UTF-8?q?Fix=20translatable=20source=20string=20us?=
 =?UTF-8?q?ing=20=E2=80=9Csilenced=E2=80=9D=20instead=20of=20=E2=80=9Climi?=
 =?UTF-8?q?ted=E2=80=9D=20(#31822)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8c9010486..980bd481b1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -25,7 +25,7 @@ en:
   admin:
     account_actions:
       action: Perform action
-      already_silenced: This account has already been silenced.
+      already_silenced: This account has already been limited.
       already_suspended: This account has already been suspended.
       title: Perform moderation action on %{acct}
     account_moderation_notes:

From 9ea710e5438ba862f135e972185a932910511715 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:59:18 +0200
Subject: [PATCH 04/89] Update dependency oj to v3.16.6 (#31831)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 48fd05b1ac..de541edfbd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -458,7 +458,7 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.5)
+    oj (3.16.6)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.2)

From 5b995143f1ba3278e799e46b76646a9878977677 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 10 Sep 2024 04:03:45 -0400
Subject: [PATCH 05/89] Use `with_options` for shared Account validation option
 value (#31827)

---
 app/models/account.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index d773d33441..4a7c752e7c 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -111,10 +111,12 @@ class Account < ApplicationRecord
   validates :display_name, length: { maximum: DISPLAY_NAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_display_name? }
   validates :note, note_length: { maximum: NOTE_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
-  validates :uri, absence: true, if: :local?, on: :create
-  validates :inbox_url, absence: true, if: :local?, on: :create
-  validates :shared_inbox_url, absence: true, if: :local?, on: :create
-  validates :followers_url, absence: true, if: :local?, on: :create
+  with_options on: :create do
+    validates :uri, absence: true, if: :local?
+    validates :inbox_url, absence: true, if: :local?
+    validates :shared_inbox_url, absence: true, if: :local?
+    validates :followers_url, absence: true, if: :local?
+  end
 
   normalizes :username, with: ->(username) { username.squish }
 

From 5260233b81c301cf7b0c79b179858748b693460b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 11:22:49 +0200
Subject: [PATCH 06/89] New Crowdin Translations (automated) (#31835)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |   2 +
 app/javascript/mastodon/locales/da.json    |   2 +
 app/javascript/mastodon/locales/de.json    |   2 +
 app/javascript/mastodon/locales/es-AR.json |   2 +
 app/javascript/mastodon/locales/fi.json    |   4 +-
 app/javascript/mastodon/locales/gl.json    |  12 +-
 app/javascript/mastodon/locales/he.json    |   2 +
 app/javascript/mastodon/locales/hu.json    |   2 +
 app/javascript/mastodon/locales/lt.json    |   2 +
 app/javascript/mastodon/locales/nl.json    |   2 +
 app/javascript/mastodon/locales/pl.json    |   2 +
 app/javascript/mastodon/locales/pt-PT.json |   2 +-
 app/javascript/mastodon/locales/tr.json    |   2 +
 app/javascript/mastodon/locales/uk.json    |   1 +
 app/javascript/mastodon/locales/zh-CN.json |   4 +-
 app/javascript/mastodon/locales/zh-TW.json |   2 +
 config/locales/ca.yml                      |  29 ++-
 config/locales/cy.yml                      |   1 -
 config/locales/da.yml                      |   2 +-
 config/locales/de.yml                      |   1 -
 config/locales/es-AR.yml                   |   2 +-
 config/locales/et.yml                      |   1 -
 config/locales/fi.yml                      |   2 +-
 config/locales/fo.yml                      |   1 -
 config/locales/fr-CA.yml                   |   1 -
 config/locales/fr.yml                      |   1 -
 config/locales/ga.yml                      |   1 -
 config/locales/gd.yml                      |   1 -
 config/locales/gl.yml                      |   4 +-
 config/locales/he.yml                      |   3 +
 config/locales/hu.yml                      |   1 -
 config/locales/ia.yml                      |   1 -
 config/locales/is.yml                      |   1 -
 config/locales/it.yml                      |   2 +-
 config/locales/ko.yml                      |   1 -
 config/locales/lt.yml                      |   3 +
 config/locales/nn.yml                      |   1 +
 config/locales/pl.yml                      |   1 -
 config/locales/pt-PT.yml                   | 207 ++++++++++++---------
 config/locales/simple_form.he.yml          |   1 +
 config/locales/simple_form.lt.yml          |   1 +
 config/locales/simple_form.pl.yml          |   1 +
 config/locales/simple_form.pt-PT.yml       |   9 +-
 config/locales/simple_form.tr.yml          |   1 +
 config/locales/sq.yml                      |   1 -
 config/locales/sv.yml                      |   1 +
 config/locales/th.yml                      |   1 -
 config/locales/tr.yml                      |   4 +
 config/locales/uk.yml                      |   1 +
 config/locales/vi.yml                      |   1 -
 config/locales/zh-CN.yml                   |   2 +-
 config/locales/zh-TW.yml                   |   4 +-
 52 files changed, 210 insertions(+), 131 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index d99b5c7375..5981c1df84 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Marca",
   "status.cancel_reblog_private": "Desfés l'impuls",
   "status.cannot_reblog": "No es pot impulsar aquest tut",
+  "status.continued_thread": "Continuació del fil",
   "status.copy": "Copia l'enllaç al tut",
   "status.delete": "Elimina",
   "status.detailed_status": "Vista detallada de la conversa",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",
+  "status.replied_in_thread": "Respost al fil",
   "status.replied_to": "En resposta a {name}",
   "status.reply": "Respon",
   "status.replyAll": "Respon al fil",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 732e4a100e..4155dc9fc5 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Bogmærk",
   "status.cancel_reblog_private": "Fjern boost",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
+  "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
   "status.detailed_status": "Detaljeret samtalevisning",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
+  "status.replied_in_thread": "Svaret i tråd",
   "status.replied_to": "Besvarede {name}",
   "status.reply": "Besvar",
   "status.replyAll": "Besvar alle",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 3c180f9f5c..e37a595469 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Beitrag als Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
+  "status.continued_thread": "Fortgeführter Thread",
   "status.copy": "Link zum Beitrag kopieren",
   "status.delete": "Beitrag löschen",
   "status.detailed_status": "Detaillierte Ansicht der Unterhaltung",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
+  "status.replied_in_thread": "Antwortete im Thread",
   "status.replied_to": "Antwortete {name}",
   "status.reply": "Antworten",
   "status.replyAll": "Allen antworten",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index c3915c9b74..20d93ed011 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Quitar adhesión",
   "status.cannot_reblog": "No se puede adherir a este mensaje",
+  "status.continued_thread": "Continuación de hilo",
   "status.copy": "Copiar enlace al mensaje",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista de conversación detallada",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",
+  "status.replied_in_thread": "Respuesta en hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 79ca95a58c..8f9cc5fe4d 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Moderoidut palvelimet",
-  "about.contact": "Yhteystiedot:",
+  "about.contact": "Yhteydenotto:",
   "about.disclaimer": "Mastodon on vapaa avoimen lähdekoodin ohjelmisto ja Mastodon gGmbH:n tavaramerkki.",
   "about.domain_blocks.no_reason_available": "Syy ei ole tiedossa",
   "about.domain_blocks.preamble": "Mastodonin avulla voi yleensä tarkastella minkä tahansa fediversumiin kuuluvan palvelimen sisältöä ja olla yhteyksissä eri palvelinten käyttäjien kanssa. Nämä poikkeukset koskevat yksin tätä palvelinta.",
@@ -780,6 +780,7 @@
   "status.bookmark": "Lisää kirjanmerkki",
   "status.cancel_reblog_private": "Peru tehostus",
   "status.cannot_reblog": "Tätä julkaisua ei voi tehostaa",
+  "status.continued_thread": "Jatkoi ketjua",
   "status.copy": "Kopioi linkki julkaisuun",
   "status.delete": "Poista",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",
+  "status.replied_in_thread": "Vastasi ketjuun",
   "status.replied_to": "Vastaus käyttäjälle {name}",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 5a5ac1dd38..df477fe9e2 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -223,7 +223,7 @@
   "domain_block_modal.title": "Bloquear dominio?",
   "domain_block_modal.you_will_lose_followers": "Vanse eliminar todas as túas seguidoras deste servidor.",
   "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificacións das usuarias deste servidor.",
-  "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras apps sociais.",
+  "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras  sociais.",
   "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
   "domain_pill.server": "Servidor",
   "domain_pill.their_handle": "O seu alcume:",
@@ -231,8 +231,8 @@
   "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
   "domain_pill.username": "Nome de usuaria",
   "domain_pill.whats_in_a_handle": "As partes do alcume?",
-  "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social de <button>plataformas ActivityPub</button>.",
-  "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social de <button>plataformas ActivityPub</button>.",
+  "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social das <button>plataformas ActivityPub</button>.",
+  "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social das <button>plataformas ActivityPub</button>.",
   "domain_pill.your_handle": "O teu alcume:",
   "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
@@ -272,7 +272,7 @@
   "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.",
-  "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificación aparecerán aquí seguindo o criterio dos teus axustes.",
+  "empty_column.notification_requests": "Todo ben! Nada por aquí. Cando recibas novas notificacións aparecerán aquí seguindo o criterio dos teus axustes.",
   "empty_column.notifications": "Aínda non tes notificacións. Aparecerán cando outras persoas interactúen contigo.",
   "empty_column.public": "Nada por aquí! Escribe algo de xeito público, ou segue de xeito manual usuarias doutros servidores para ir enchéndoo",
   "error.unexpected_crash.explanation": "Debido a un erro no noso código ou a unha compatilidade co teu navegador, esta páxina non pode ser amosada correctamente.",
@@ -641,7 +641,7 @@
   "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.body": "Dille ás amizades como poden atoparte en Mastodon.",
   "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!",
@@ -780,6 +780,7 @@
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Desfacer compartido",
   "status.cannot_reblog": "Esta publicación non pode ser promovida",
+  "status.continued_thread": "Continua co fío",
   "status.copy": "Copiar ligazón á publicación",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_in_thread": "Respondeu nun fío",
   "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder ao tema",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 44c95d64c6..47fc444e88 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -780,6 +780,7 @@
   "status.bookmark": "סימניה",
   "status.cancel_reblog_private": "הסרת הדהוד",
   "status.cannot_reblog": "לא ניתן להדהד חצרוץ זה",
+  "status.continued_thread": "שרשור מתמשך",
   "status.copy": "העתק/י קישור להודעה זו",
   "status.delete": "מחיקה",
   "status.detailed_status": "תצוגת שיחה מפורטת",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
   "status.redraft": "מחיקה ועריכה מחדש",
   "status.remove_bookmark": "הסרת סימניה",
+  "status.replied_in_thread": "תגובה לשרשור",
   "status.replied_to": "בתגובה לחשבון {name}",
   "status.reply": "תגובה",
   "status.replyAll": "תגובה לשרשור",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index d55a85ee33..f0f08ca50c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Könyvjelzőzés",
   "status.cancel_reblog_private": "Megtolás visszavonása",
   "status.cannot_reblog": "Ezt a bejegyzést nem lehet megtolni",
+  "status.continued_thread": "Folytatott szál",
   "status.copy": "Link másolása bejegyzésbe",
   "status.delete": "Törlés",
   "status.detailed_status": "Részletes beszélgetési nézet",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",
+  "status.replied_in_thread": "Válaszolva a szálban",
   "status.replied_to": "Megválaszolva {name} számára",
   "status.reply": "Válasz",
   "status.replyAll": "Válasz a beszélgetésre",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index f58c405f28..55ef2afce8 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -770,6 +770,7 @@
   "status.bookmark": "Pridėti į žymės",
   "status.cancel_reblog_private": "Nebepakelti",
   "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
+  "status.continued_thread": "Tęsiama gijoje",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",
   "status.detailed_status": "Išsami pokalbio peržiūra",
@@ -802,6 +803,7 @@
   "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
   "status.redraft": "Ištrinti ir parengti iš naujo",
   "status.remove_bookmark": "Pašalinti žymę",
+  "status.replied_in_thread": "Atsakyta gijoje",
   "status.replied_to": "Atsakyta į {name}",
   "status.reply": "Atsakyti",
   "status.replyAll": "Atsakyti į giją",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 3526568249..7956435361 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
+  "status.continued_thread": "Vervolgt het gesprek",
   "status.copy": "Link naar bericht kopiëren",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
+  "status.replied_in_thread": "Reageerde in gesprek",
   "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
   "status.replyAll": "Op iedereen reageren",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 09ac636185..6bf6252d70 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Dodaj zakładkę",
   "status.cancel_reblog_private": "Cofnij podbicie",
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
+  "status.continued_thread": "Ciąg dalszy wątku",
   "status.copy": "Skopiuj odnośnik do wpisu",
   "status.delete": "Usuń",
   "status.detailed_status": "Szczegółowy widok konwersacji",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
   "status.redraft": "Usuń i przeredaguj",
   "status.remove_bookmark": "Usuń zakładkę",
+  "status.replied_in_thread": "Odpowiedź w wątku",
   "status.replied_to": "Odpowiedź do wpisu użytkownika {name}",
   "status.reply": "Odpowiedz",
   "status.replyAll": "Odpowiedz na wątek",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 2d0013d607..fd811d6833 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -278,7 +278,7 @@
   "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a um problema de compatibilidade do navegador, esta página não pôde ser apresentada corretamente.",
   "error.unexpected_crash.explanation_addons": "Esta página não pôde ser exibida corretamente. Este erro provavelmente é causado por um complemento do navegador ou ferramentas de tradução automática.",
   "error.unexpected_crash.next_steps": "Tente atualizar a página. Se isso não ajudar, pode usar o Mastodon através de um navegador diferente ou uma aplicação nativa.",
-  "error.unexpected_crash.next_steps_addons": "Tente desabilitá-los e atualizar a página. Se isso não ajudar, você ainda poderá usar o Mastodon por meio de um navegador diferente ou de um aplicativo nativo.",
+  "error.unexpected_crash.next_steps_addons": "Tente desativá-los e atualizar a página. Se isso não ajudar, poderá ainda ser possível utilizar o Mastodon através de um navegador diferente ou de uma aplicação nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar a stacktrace para o clipboard",
   "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.search_results": "Resultados da pesquisa",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 9b94ede76a..4873fa943e 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Yer işareti ekle",
   "status.cancel_reblog_private": "Yeniden paylaşımı geri al",
   "status.cannot_reblog": "Bu gönderi yeniden paylaşılamaz",
+  "status.continued_thread": "Devam eden akış",
   "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",
   "status.detailed_status": "Ayrıntılı sohbet görünümü",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Henüz hiç kimse bu gönderiyi yeniden paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
   "status.redraft": "Sil,Düzenle ve Yeniden paylaş",
   "status.remove_bookmark": "Yer işaretini kaldır",
+  "status.replied_in_thread": "Akışta yanıtlandı",
   "status.replied_to": "{name} kullanıcısına yanıt verdi",
   "status.reply": "Yanıtla",
   "status.replyAll": "Konuyu yanıtla",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 714348db25..b63596037b 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Додати до закладок",
   "status.cancel_reblog_private": "Скасувати поширення",
   "status.cannot_reblog": "Цей допис не може бути поширений",
+  "status.continued_thread": "Continued thread",
   "status.copy": "Копіювати посилання на допис",
   "status.delete": "Видалити",
   "status.detailed_status": "Детальний вигляд бесіди",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index ea4ebcda47..94adc9af2d 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -95,7 +95,7 @@
   "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
   "block_modal.they_will_know": "他们将能看到他们被屏蔽。",
   "block_modal.title": "是否屏蔽该用户？",
-  "block_modal.you_wont_see_mentions": "你将无法看到提及他们的嘟文。",
+  "block_modal.you_wont_see_mentions": "你将不会看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "boost_modal.reblog": "是否转嘟？",
   "boost_modal.undo_reblog": "是否取消转嘟？",
@@ -780,6 +780,7 @@
   "status.bookmark": "添加到书签",
   "status.cancel_reblog_private": "取消转贴",
   "status.cannot_reblog": "这条嘟文不允许被转嘟",
+  "status.continued_thread": "继续线程",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",
   "status.detailed_status": "详细的对话视图",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
+  "status.replied_in_thread": "已在线程中回复",
   "status.replied_to": "回复给 {name}",
   "status.reply": "回复",
   "status.replyAll": "回复所有人",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 257bec0163..e671803573 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -780,6 +780,7 @@
   "status.bookmark": "書籤",
   "status.cancel_reblog_private": "取消轉嘟",
   "status.cannot_reblog": "這則嘟文無法被轉嘟",
+  "status.continued_thread": "接續討論串",
   "status.copy": "複製嘟文連結",
   "status.delete": "刪除",
   "status.detailed_status": "詳細的對話內容",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
+  "status.replied_in_thread": "於討論串中回覆",
   "status.replied_to": "回覆 {name}",
   "status.reply": "回覆",
   "status.replyAll": "回覆討論串",
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8918228f46..121266916f 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -25,7 +25,7 @@ ca:
   admin:
     account_actions:
       action: Realitza l'acció
-      already_silenced: Aquest compte ja s'ha silenciat.
+      already_silenced: Aquest compte ja s'ha limitat.
       already_suspended: Aquest compte ja s'ha suspès.
       title: Fer l'acció de moderació a %{acct}
     account_moderation_notes:
@@ -61,6 +61,7 @@ ca:
       demote: Degrada
       destroyed_msg: Les dades de %{username} son a la cua per a ser esborrades en breu
       disable: Inhabilita
+      disable_sign_in_token_auth: Desactivar l'autenticació de token per correu-e
       disable_two_factor_authentication: Desactiva 2FA
       disabled: Inhabilitat
       display_name: Nom visible
@@ -69,6 +70,7 @@ ca:
       email: Adreça electrònica
       email_status: Estat de l'adreça electrònica
       enable: Habilita
+      enable_sign_in_token_auth: Activar l'autenticació de token per correu-e
       enabled: Habilitat
       enabled_msg: El compte de %{username} s’ha descongelat amb èxit
       followers: Seguidors
@@ -201,8 +203,10 @@ ca:
         destroy_user_role: Destrueix Rol
         disable_2fa_user: Desactiva 2FA
         disable_custom_emoji: Desactiva l'emoji personalitzat
+        disable_sign_in_token_auth_user: Desactivar l'autenticació de token per correu-e per a l'usuari
         disable_user: Deshabilita l'usuari
         enable_custom_emoji: Activa l'emoji personalitzat
+        enable_sign_in_token_auth_user: Activar l'autenticació de token per correu-e per a l'usuari
         enable_user: Activa l'usuari
         memorialize_account: Memoritza el compte
         promote_user: Promou l'usuari
@@ -237,17 +241,21 @@ ca:
         confirm_user_html: "%{name} ha confirmat l'adreça del correu electrònic de l'usuari %{target}"
         create_account_warning_html: "%{name} ha enviat un avís a %{target}"
         create_announcement_html: "%{name} ha creat un nou anunci %{target}"
+        create_canonical_email_block_html: "%{name} ha blocat l'adreça de correu electrònic amb el hash %{target}"
         create_custom_emoji_html: "%{name} ha pujat un emoji nou %{target}"
         create_domain_allow_html: "%{name} ha permès la federació amb el domini %{target}"
         create_domain_block_html: "%{name} ha bloquejat el domini %{target}"
+        create_email_domain_block_html: "%{name} ha blocat el domini de correu electrònic %{target}"
         create_ip_block_html: "%{name} ha creat una regla per a l'IP %{target}"
         create_unavailable_domain_html: "%{name} ha aturat el lliurament al domini %{target}"
         create_user_role_html: "%{name} ha creat el rol %{target}"
         demote_user_html: "%{name} ha degradat l'usuari %{target}"
         destroy_announcement_html: "%{name} ha eliminat l'anunci %{target}"
+        destroy_canonical_email_block_html: "%{name} ha desblocat el correu electrònic amb el hash %{target}"
         destroy_custom_emoji_html: "%{name} ha esborrat l'emoji %{target}"
         destroy_domain_allow_html: "%{name} no permet la federació amb el domini %{target}"
         destroy_domain_block_html: "%{name} ha desbloquejat el domini %{target}"
+        destroy_email_domain_block_html: "%{name} ha desblocat el domini de correu electrònic %{target}"
         destroy_instance_html: "%{name} ha purgat el domini %{target}"
         destroy_ip_block_html: "%{name} ha esborrat la regla per a l'IP %{target}"
         destroy_status_html: "%{name} ha eliminat el tut de %{target}"
@@ -255,8 +263,10 @@ ca:
         destroy_user_role_html: "%{name} ha esborrat el rol %{target}"
         disable_2fa_user_html: "%{name} ha desactivat el requisit de dos factors per a l'usuari %{target}"
         disable_custom_emoji_html: "%{name} ha desactivat l'emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} ha desactivat l'autenticació de token per correu-e per a %{target}"
         disable_user_html: "%{name} ha desactivat l'accés del usuari %{target}"
         enable_custom_emoji_html: "%{name} ha activat l'emoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ha activat l'autenticació de token per correu-e per a %{target}"
         enable_user_html: "%{name} ha activat l'accés del usuari %{target}"
         memorialize_account_html: "%{name} ha convertit el compte %{target} en una pàgina de memorial"
         promote_user_html: "%{name} ha promogut l'usuari %{target}"
@@ -264,6 +274,7 @@ ca:
         reject_user_html: "%{name} ha rebutjat el registre de %{target}"
         remove_avatar_user_html: "%{name} ha eliminat l'avatar de %{target}"
         reopen_report_html: "%{name} ha reobert l'informe %{target}"
+        resend_user_html: "%{name} ha reenviat el correu-e de confirmació per %{target}"
         reset_password_user_html: "%{name} ha restablert la contrasenya de l'usuari %{target}"
         resolve_report_html: "%{name} ha resolt l'informe %{target}"
         sensitive_account_html: "%{name} ha marcat els mèdia de %{target} com a sensibles"
@@ -432,6 +443,7 @@ ca:
       new:
         create: Afegir un domini
         resolve: Resol domini
+        title: Blocar el nou domini de correu-e
       not_permitted: No permés
       resolved_through_html: Resolt mitjançant %{domain}
     export_domain_allows:
@@ -1402,6 +1414,7 @@ ca:
     authentication_methods:
       otp: aplicació d'autenticació de dos factors
       password: contrasenya
+      sign_in_token: codi de seguretat per correu electrònic
       webauthn: claus de seguretat
     description_html: Si veus activitat que no reconeixes, considera canviar la teva contrasenya i activar l'autenticació de dos factors.
     empty: Historial d'autenticació no disponible
@@ -1412,6 +1425,16 @@ ca:
     unsubscribe:
       action: Sí, canceŀla la subscripció
       complete: Subscripció cancel·lada
+      confirmation_html: Segur que vols donar-te de baixa de rebre %{type} de Mastodon a %{domain} a %{email}? Sempre pots subscriure't de nou des de la <a href="%{settings_path}">configuració de les notificacions per correu electrònic</a>.
+      emails:
+        notification_emails:
+          favourite: notificacions dels favorits per correu electrònic
+          follow: notificacions dels seguiments per correu electrònic
+          follow_request: correus electrònics de peticions de seguiment
+          mention: correus electrònics de notificacions de mencions
+          reblog: correus electrònics de notificacions d'impulsos
+      resubscribe_html: Si ets dones de baixa per error pots donar-te d'alta des de la <a href="%{settings_path}">configuració de les notificacions per correu electrònic</a>.
+      success_html: Ja no rebràs %{type} de Mastodon a %{domain} a %{email}.
       title: Cancel·la la subscripció
   media_attachments:
     validations:
@@ -1493,6 +1516,8 @@ ca:
     update:
       subject: "%{name} ha editat una publicació"
   notifications:
+    administration_emails: Notificacions per correu-e de l'administrador
+    email_events: Esdeveniments per a notificacions de correu electrònic
     email_events_hint: 'Selecciona els esdeveniments per als quals vols rebre notificacions:'
   number:
     human:
@@ -1651,6 +1676,7 @@ ca:
     import: Importació
     import_and_export: Importació i exportació
     migrate: Migració del compte
+    notifications: Notificacions per correu electrònic
     preferences: Preferències
     profile: Perfil
     relationships: Seguits i seguidors
@@ -1897,6 +1923,7 @@ ca:
     invalid_otp_token: El codi de dos factors no és correcte
     otp_lost_help_html: Si has perdut l'accés a tots dos pots contactar per %{email}
     rate_limited: Excessius intents d'autenticació, torneu-hi més tard.
+    seamless_external_login: Has iniciat sessió via un servei extern. Així, els ajustos de contrasenya i correu electrònic no estan disponibles.
     signed_in_as: 'Sessió iniciada com a:'
   verification:
     extra_instructions_html: <strong>Consell:</strong> l'enllaç al vostre lloc web pot ser invisible. La part important és <code>rel="me"</code> que evita que us suplantin la identitat a llocs web amb contingut generat pels usuaris. Fins i tot podeu generar una etiqueta <code>link</code> a la capçalera de la pàgina en comptes d'una <code>a</code>, però el codi HTML ha de ser accessible sense requerir executar JavaScript.
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 4a01967e23..b3886ffeb2 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -33,7 +33,6 @@ cy:
   admin:
     account_actions:
       action: Cyflawni gweithred
-      already_silenced: Mae'r cyfrif hwn eisoes wedi'i dewi.
       already_suspended: Mae'r cyfrif hwn eisoes wedi'i atal.
       title: Cyflawni gweithred cymedroli ar %{acct}
     account_moderation_notes:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index e3f8343452..89430e37ed 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -25,7 +25,7 @@ da:
   admin:
     account_actions:
       action: Udfør handling
-      already_silenced: Denne konto er allerede gjort tavs.
+      already_silenced: Denne konto er allerede blevet begrænset.
       already_suspended: Denne konto er allerede suspenderet.
       title: Udfør moderatorhandling på %{acct}
     account_moderation_notes:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2952d22d7c..975ec517f7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -25,7 +25,6 @@ de:
   admin:
     account_actions:
       action: Aktion ausführen
-      already_silenced: Dieses Konto wurde bereits stummgeschaltet.
       already_suspended: Dieses Konto wurde bereits gesperrt.
       title: "@%{acct} moderieren"
     account_moderation_notes:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 520211e2e2..bd15c9862d 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -25,7 +25,7 @@ es-AR:
   admin:
     account_actions:
       action: Ejecutar acción
-      already_silenced: Esta cuenta ya ha sido limitada.
+      already_silenced: Esta cuenta ya fue limitada.
       already_suspended: Esta cuenta ya ha sido suspendida.
       title: Ejecutar acción de moderación en %{acct}
     account_moderation_notes:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index bbd1b4ab20..d2a4bc605e 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -25,7 +25,6 @@ et:
   admin:
     account_actions:
       action: Täida tegevus
-      already_silenced: See konto on juba vaigistatud.
       already_suspended: See konto on juba peatatud.
       title: Rakenda moderaatori tegevus kasutajale %{acct}
     account_moderation_notes:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 0c5d5ef987..c94f04a9bb 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -981,7 +981,7 @@ fi:
         used_by_over_week:
           one: Käyttänyt yksi käyttäjä viimeisen viikon aikana
           other: Käyttänyt %{count} käyttäjää viimeisen viikon aikana
-      title: Suositukset ja suuntaukset
+      title: Suositukset ja trendit
       trending: Trendaus
     warning_presets:
       add_new: Lisää uusi
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 040e312d78..f3d9aee4c2 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -25,7 +25,6 @@ fo:
   admin:
     account_actions:
       action: Frem atgerð
-      already_silenced: Hendan kontan er longu gjørd kvirr.
       already_suspended: Hendan kontan er longu ógildað.
       title: Frem umsjónaratgerð á %{acct}
     account_moderation_notes:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index dd1f73c459..766ba71d8a 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -25,7 +25,6 @@ fr-CA:
   admin:
     account_actions:
       action: Effectuer l'action
-      already_silenced: Ce compte est déjà limité.
       already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7e30b517a6..420a4d314e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -25,7 +25,6 @@ fr:
   admin:
     account_actions:
       action: Effectuer l'action
-      already_silenced: Ce compte est déjà limité.
       already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 4ea9cef73d..d2783a5a6a 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -31,7 +31,6 @@ ga:
   admin:
     account_actions:
       action: Déan gníomh
-      already_silenced: Tá an cuntas seo ina thost cheana féin.
       already_suspended: Tá an cuntas seo curtha ar fionraí cheana féin.
       title: Dean gníomh modhnóireachta ar %{acct}
     account_moderation_notes:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index f824e30815..c08ba60213 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -29,7 +29,6 @@ gd:
   admin:
     account_actions:
       action: Gabh an gnìomh
-      already_silenced: Chaidh an cunntas seo a chuingeachadh mu thràth.
       already_suspended: Chaidh an cunntas seo a chur à rèim mu thràth.
       title: Gabh gnìomh maorsainneachd air %{acct}
     account_moderation_notes:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index de4840dda1..657908922d 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -25,7 +25,7 @@ gl:
   admin:
     account_actions:
       action: Executar acción
-      already_silenced: Esta conta xa está silenciada.
+      already_silenced: A conta xa está limitada
       already_suspended: Esta conta xa está suspendida.
       title: Executar acción de moderación a %{acct}
     account_moderation_notes:
@@ -1854,7 +1854,7 @@ gl:
     failed_2fa:
       details: 'Detalles do intento de acceso:'
       explanation: Alguén intentou acceder á túa conta mais fíxoo cun segundo factor de autenticación non válido.
-      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente xa que a conta podería estar en risco.
+      further_actions_html: Se non foches ti, recomendámosche %{action} inmediatamente porque a conta podería estar en risco.
       subject: Fallo co segundo factor de autenticación
       title: Fallou o segundo factor de autenticación
     suspicious_sign_in:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 47ec5cafbe..a838c69636 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -29,6 +29,7 @@ he:
   admin:
     account_actions:
       action: בצע/י פעולה
+      already_suspended: חשבון זה הושעה.
       title: ביצוע פעולות הנהלה על %{acct}
     account_moderation_notes:
       create: ליצור
@@ -50,6 +51,7 @@ he:
         title: שינוי כתובת דוא"ל עבור המשתמש.ת %{username}
       change_role:
         changed_msg: התפקיד שונה בהצלחה!
+        edit_roles: נהל תפקידי משתמש
         label: שינוי תפקיד
         no_role: ללא תפקיד
         title: שינוי תפקיד עבור %{username}
@@ -626,6 +628,7 @@ he:
         suspend_description_html: חשבון זה על כל תכניו יחסמו וברבות הימים ימחקו, כל פעילות מולו לא תתאפשר. הפעולה ניתנת לביטול תוך 30 ימים, והיא תסגור כל דיווח התלוי ועומד נגד החשבון.
       actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       actions_description_remote_html: בחרו איזו פעולה לבצע כדי לפתור את הדיווח שהוגש. פעולה זו תשפיע רק על התקשורת מול השרת <strong>שלך</strong> עם החשבון המרוחק ותוכנו.
+      actions_no_posts: דווח זה לא כולל הודעות למחיקה
       add_to_report: הוספת פרטים לדיווח
       already_suspended_badges:
         local: כבר הודח בשרת זה
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 60fb96a121..71af138305 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -25,7 +25,6 @@ hu:
   admin:
     account_actions:
       action: Művelet végrehajtása
-      already_silenced: Ezt a fiókot már elnémították.
       already_suspended: Ezt a fiókot már felfüggesztették.
       title: 'Moderálási művelet végrehajtása ezen: %{acct}'
     account_moderation_notes:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 683edbe7cb..8827e084d2 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -25,7 +25,6 @@ ia:
   admin:
     account_actions:
       action: Exequer action
-      already_silenced: Iste conto jam ha essite silentiate.
       already_suspended: Iste conto jam ha essite suspendite.
       title: Exequer action de moderation sur %{acct}
     account_moderation_notes:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 0854d88123..748d931ff8 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -25,7 +25,6 @@ is:
   admin:
     account_actions:
       action: Framkvæma aðgerð
-      already_silenced: Þessi aðgangur hefur þegar verið þaggaður.
       already_suspended: Þessi aðgangur hefur þegar verið settur í frysti.
       title: Framkvæma umsjónaraðgerð á %{acct}
     account_moderation_notes:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 66a462e61f..a1ed71a7a0 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -25,7 +25,7 @@ it:
   admin:
     account_actions:
       action: Esegui azione
-      already_silenced: Questo account è già stato silenziato.
+      already_silenced: Questo account è già stato limitato.
       already_suspended: Questo account è già stato sospeso.
       title: Esegui l'azione di moderazione su %{acct}
     account_moderation_notes:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9bec26c450..962ecdd053 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -23,7 +23,6 @@ ko:
   admin:
     account_actions:
       action: 조치 취하기
-      already_silenced: 이 계정은 이미 침묵되었습니다.
       already_suspended: 이 계정은 이미 정지되었습니다.
       title: "%{acct} 계정에 중재 취하기"
     account_moderation_notes:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 0fd71f52ed..c48b8ef93b 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -29,6 +29,7 @@ lt:
   admin:
     account_actions:
       action: Atlikti veiksmą
+      already_suspended: Ši paskyra jau sustabdyta.
       title: Atlikti prižiūrėjimo veiksmą %{acct}
     account_moderation_notes:
       create: Palikti pastabą
@@ -49,6 +50,7 @@ lt:
         title: Keisti el. paštą %{username}
       change_role:
         changed_msg: Vaidmuo sėkmingai pakeistas.
+        edit_roles: Tvarkyti naudotojų vaidmenis
         label: Keisti vaidmenį
         no_role: Jokios vaidmenį
         title: Keisti vaidmenį %{username}
@@ -485,6 +487,7 @@ lt:
       destroyed_msg: Skundo žinutė sekmingai ištrinta!
     reports:
       action_taken_by: Veiksmo ėmėsi
+      actions_no_posts: Ši ataskaita neturi jokių susijusių įrašų ištrinti
       already_suspended_badges:
         local: Jau sustabdytas šiame serveryje
         remote: Jau sustabdytas jų serveryje
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index f301b8ca98..f7c2f74260 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -25,6 +25,7 @@ nn:
   admin:
     account_actions:
       action: Utfør
+      already_silenced: Denne kontoen har allereie vorte avgrensa.
       title: Utfør moderatorhandling på %{acct}
     account_moderation_notes:
       create: Legg igjen merknad
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 2a1a0c8d75..7a8d208b06 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -29,7 +29,6 @@ pl:
   admin:
     account_actions:
       action: Wykonaj działanie
-      already_silenced: To konto zostało już wyciszone.
       already_suspended: To konto zostało już zawieszone.
       title: Wykonaj działanie moderacyjne na %{acct}
     account_moderation_notes:
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 1bd724595d..96cb92efda 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -4,8 +4,8 @@ pt-PT:
     about_mastodon_html: 'A rede social do futuro: sem publicidade, e sem vigilância empresarial; desenho ético, e descentralizado! Tome posse dos seus dados com o Mastodon!'
     contact_missing: Por definir
     contact_unavailable: n.d.
-    hosted_on: Mastodon em %{domain}
-    title: Acerca de
+    hosted_on: Mastodon alojado em %{domain}
+    title: Sobre
   accounts:
     follow: Seguir
     followers:
@@ -25,15 +25,17 @@ pt-PT:
   admin:
     account_actions:
       action: Executar acção
+      already_suspended: Esta conta já foi suspensa.
       title: Executar ação de moderação em %{acct}
     account_moderation_notes:
       create: Deixar uma nota
       created_msg: Nota de moderação criada com sucesso!
       destroyed_msg: Nota de moderação destruída!
     accounts:
+      add_email_domain_block: Bloquear domínio de e-mail
       approve: Aprovar
       approved_msg: Inscrição de %{username} aprovada com sucesso
-      are_you_sure: Tens a certeza?
+      are_you_sure: Tem a certeza?
       avatar: Imagem de perfil
       by_domain: Domínio
       change_email:
@@ -45,18 +47,20 @@ pt-PT:
         title: Alterar e-mail para %{username}
       change_role:
         changed_msg: Função alterada com sucesso!
+        edit_roles: Gerir funções de utilizador
         label: Alterar função
         no_role: Nenhuma função
         title: Alterar a função de %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: A confirmar
-      custom: Personalizar
+      custom: Personalizado
       delete: Eliminar dados
       deleted: Eliminada
-      demote: Despromoveu
+      demote: Despromovida
       destroyed_msg: Os dados de %{username} estão agora em fila de espera para serem eliminados de imediato
       disable: Congelar
+      disable_sign_in_token_auth: Desativar token de autenticação por e-mail
       disable_two_factor_authentication: Desativar autenticação por dois fatores (2FA)
       disabled: Congelada
       display_name: Nome a mostrar
@@ -65,6 +69,7 @@ pt-PT:
       email: E-mail
       email_status: Estado do e-mail
       enable: Descongelar
+      enable_sign_in_token_auth: Ativar token de autenticação por e-mail
       enabled: Ativado
       enabled_msg: Descongelou a conta %{username}
       followers: Seguidores
@@ -100,8 +105,8 @@ pt-PT:
       no_limits_imposed: Sem limites impostos
       no_role_assigned: Nenhuma função atribuída
       not_subscribed: Não inscrito
-      pending: Pendente de revisão
-      perform_full_suspension: Fazer suspensão completa
+      pending: Revisão pendente
+      perform_full_suspension: Suspender
       previous_strikes: Reprimendas anteriores
       previous_strikes_description_html:
         one: Esta conta tem <strong>1</strong> reprimenda.
@@ -109,7 +114,7 @@ pt-PT:
       promote: Promover
       protocol: Protocolo
       public: Público
-      push_subscription_expires: A Inscrição PuSH expira
+      push_subscription_expires: A inscrição PuSH expira
       redownload: Atualizar perfil
       redownloaded_msg: Perfil de %{username} atualizado a partir da origem com sucesso
       reject: Rejeitar
@@ -122,13 +127,14 @@ pt-PT:
       removed_header_msg: Imagem de cabeçalho de %{username} removida
       resend_confirmation:
         already_confirmed: Este utilizador já está confirmado
-        send: Reenviar link de confirmação
-        success: Link de confirmação enviado com sucesso!
-      reset: Reiniciar
+        send: Reenviar hiperligação de confirmação
+        success: Hiperligação de confirmação enviada com sucesso!
+      reset: Repor
       reset_password: Criar nova palavra-passe
       resubscribe: Reinscrever
       role: Função
       search: Pesquisar
+      search_same_email_domain: Outros utilizadores com o mesmo domínio de e-mail
       search_same_ip: Outros utilizadores com o mesmo IP
       security: Segurança
       security_measures:
@@ -136,7 +142,7 @@ pt-PT:
         password_and_2fa: Palavra-passe e 2FA
       sensitive: Marcar como problemático
       sensitized: Marcada como problemática
-      shared_inbox_url: URL da caixa de entrada compartilhada
+      shared_inbox_url: URL da caixa de entrada partilhada
       show:
         created_reports: Denúncias realizadas
         targeted_reports: Denunciada por outros
@@ -151,101 +157,116 @@ pt-PT:
       suspension_reversible_hint_html: A conta foi suspensa e os dados serão totalmente eliminados em %{date}. Até lá, a conta poderá ser recuperada sem quaisquer efeitos negativos. Se deseja eliminar todos os dados desta conta imediatamente, pode fazê-lo em baixo.
       title: Contas
       unblock_email: Desbloquear endereço de e-mail
-      unblocked_email_msg: Endereço de e-mail de %{username} desbloqueado
+      unblocked_email_msg: Endereço de e-mail de %{username} desbloqueado com sucesso
       unconfirmed_email: E-mail por confirmar
       undo_sensitized: Desmarcar como problemático
       undo_silenced: Desfazer silenciar
       undo_suspension: Desfazer supensão
-      unsilenced_msg: Removeu as limitações da conta %{username}
+      unsilenced_msg: Limitações da conta %{username} removidas com sucesso
       unsubscribe: Cancelar inscrição
       unsuspended_msg: Removeu a suspensão da conta %{username}
       username: Nome de utilizador
       view_domain: Ver resumo do domínio
       warn: Advertir
-      web: Teia
+      web: Web
       whitelisted: Permitido para a federação
     action_logs:
       action_types:
         approve_appeal: Aprovar recurso
         approve_user: Aprovar utilizador
-        assigned_to_self_report: Atribuir Denúncia
-        change_role_user: Alterar Função do Utilizador
-        confirm_user: Confirmar Utilizador
-        create_account_warning: Criar Aviso
+        assigned_to_self_report: Atribuir denúncia
+        change_email_user: Alterar e-mail do utilizador
+        change_role_user: Alterar função do utilizador
+        confirm_user: Confirmar utilizador
+        create_account_warning: Criar aviso
         create_announcement: Criar comunicado
-        create_custom_emoji: Criar Emoji Personalizado
-        create_domain_allow: Criar Permissão de Domínio
-        create_domain_block: Criar Bloqueio de Domínio
+        create_canonical_email_block: Criar bloqueio de e-mail
+        create_custom_emoji: Criar emoji personalizado
+        create_domain_allow: Criar permissão de domínio
+        create_domain_block: Criar bloqueio de domínio
+        create_email_domain_block: Criar bloqueio de domínio de e-mail
         create_ip_block: Criar regra de IP
-        create_unavailable_domain: Criar Domínio Indisponível
-        create_user_role: Criar Função
-        demote_user: Despromover Utilizador
-        destroy_announcement: Apagar comunicado
-        destroy_custom_emoji: Eliminar Emoji Personalizado
-        destroy_domain_allow: Eliminar Permissão de Domínio
-        destroy_domain_block: Eliminar Bloqueio de Domínio
-        destroy_instance: Purgar Domínio
+        create_unavailable_domain: Criar domínio indisponível
+        create_user_role: Criar função
+        demote_user: Despromover utilizador
+        destroy_announcement: Eliminar comunicado
+        destroy_canonical_email_block: Eliminar bloqueio de e-mail
+        destroy_custom_emoji: Eliminar emoji personalizado
+        destroy_domain_allow: Eliminar permissão de domínio
+        destroy_domain_block: Eliminar bloqueio de domínio
+        destroy_email_domain_block: Eliminar bloqueio de domínio de e-mail
+        destroy_instance: Purgar domínio
         destroy_ip_block: Eliminar regra de IP
-        destroy_status: Eliminar Publicação
-        destroy_unavailable_domain: Eliminar Domínio Indisponível
-        destroy_user_role: Eliminar Função
+        destroy_status: Eliminar publicação
+        destroy_unavailable_domain: Eliminar domínio indisponível
+        destroy_user_role: Eliminar função
         disable_2fa_user: Desativar 2FA
-        disable_custom_emoji: Desativar Emoji Personalizado
-        disable_user: Desativar Utilizador
-        enable_custom_emoji: Ativar Emoji Personalizado
-        enable_user: Ativar Utilizador
-        memorialize_account: Tornar conta num memorial
-        promote_user: Promover Utilizador
-        reject_appeal: Rejeitar Recurso
-        reject_user: Rejeitar Utilizador
-        remove_avatar_user: Remover Imagem de Perfil
-        reopen_report: Reabrir Denúncia
-        resend_user: Reenviar E-mail de Confirmação
-        reset_password_user: Repor Password
-        resolve_report: Resolver Denúncia
+        disable_custom_emoji: Desativar emoji personalizado
+        disable_sign_in_token_auth_user: Desativar token de autenticação por e-mail para o utilizador
+        disable_user: Desativar utilizador
+        enable_custom_emoji: Ativar emoji personalizado
+        enable_sign_in_token_auth_user: Ativar token de autenticação por e-mail para o utilizador
+        enable_user: Ativar utilizador
+        memorialize_account: Transformar conta num memorial
+        promote_user: Promover utilizador
+        reject_appeal: Rejeitar recurso
+        reject_user: Rejeitar utilizador
+        remove_avatar_user: Remover imagem de perfil
+        reopen_report: Reabrir denúncia
+        resend_user: Reenviar e-mail de confirmação
+        reset_password_user: Repor palavra-passe
+        resolve_report: Resolver denúncia
         sensitive_account: Marcar a media na sua conta como problemática
         silence_account: Limitar conta
         suspend_account: Suspender conta
-        unassigned_report: Desatribuir Denúncia
+        unassigned_report: Anular atribuição desta denúncia
         unblock_email_account: Desbloquear endereço de e-mail
         unsensitive_account: Desmarcar a conta como problemática
-        unsilence_account: Deixar de Silenciar Conta
-        unsuspend_account: Retirar Suspensão à Conta
+        unsilence_account: Deixar de silenciar conta
+        unsuspend_account: Retirar suspensão da conta
         update_announcement: Atualizar comunicado
-        update_custom_emoji: Atualizar Emoji Personalizado
-        update_domain_block: Atualizar Bloqueio de Domínio
+        update_custom_emoji: Atualizar emoji personalizado
+        update_domain_block: Atualizar bloqueio de domínio
         update_ip_block: Atualizar regra de IP
-        update_report: Atualizar Relatório
-        update_status: Atualizar Estado
-        update_user_role: Atualizar Função
+        update_report: Atualizar denúncia
+        update_status: Atualizar publicação
+        update_user_role: Atualizar função
       actions:
         approve_appeal_html: "%{name} aprovou recurso da decisão de moderação de %{target}"
         approve_user_html: "%{name} aprovou a inscrição de %{target}"
         assigned_to_self_report_html: "%{name} atribuiu a denúncia %{target} a si próprio"
+        change_email_user_html: "%{name} alterou o endereço de e-mail do utilizador %{target}"
         change_role_user_html: "%{name} alterou a função de %{target}"
+        confirm_user_html: "%{name} confirmou o endereço de e-mail do utilizador %{target}"
         create_account_warning_html: "%{name} enviou um aviso para %{target}"
         create_announcement_html: "%{name} criou o novo anúncio %{target}"
-        create_custom_emoji_html: "%{name} carregou o novo emoji %{target}"
+        create_canonical_email_block_html: "%{name} bloqueou o e-mail com a hash %{target}"
+        create_custom_emoji_html: "%{name} enviou o novo emoji %{target}"
         create_domain_allow_html: "%{name} permitiu a federação com o domínio %{target}"
         create_domain_block_html: "%{name} bloqueou o domínio %{target}"
-        create_ip_block_html: "%{name} criou regra para o IP %{target}"
-        create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
+        create_email_domain_block_html: "%{name} bloqueou o domínio de e-mail %{target}"
+        create_ip_block_html: "%{name} criou uma regra para o IP %{target}"
+        create_unavailable_domain_html: "%{name} parou as entregas ao domínio %{target}"
         create_user_role_html: "%{name} criou a função %{target}"
         demote_user_html: "%{name} despromoveu o utilizador %{target}"
         destroy_announcement_html: "%{name} eliminou o anúncio %{target}"
+        destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com a hash %{target}"
         destroy_custom_emoji_html: "%{name} eliminou o emoji %{target}"
-        destroy_domain_allow_html: "%{name} desabilitou a federação com o domínio %{target}"
+        destroy_domain_allow_html: "%{name} bloqueou a federação com o domínio %{target}"
         destroy_domain_block_html: "%{name} desbloqueou o domínio %{target}"
+        destroy_email_domain_block_html: "%{name} desbloqueou o domínio de e-mail %{target}"
         destroy_instance_html: "%{name} purgou o domínio %{target}"
-        destroy_ip_block_html: "%{name} eliminou regra para o IP %{target}"
+        destroy_ip_block_html: "%{name} eliminou a regra para o IP %{target}"
         destroy_status_html: "%{name} removeu a publicação de %{target}"
-        destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
+        destroy_unavailable_domain_html: "%{name} retomou as entregas ao domínio %{target}"
         destroy_user_role_html: "%{name} eliminou a função %{target}"
         disable_2fa_user_html: "%{name} desativou o requerimento de autenticação em dois passos para o utilizador %{target}"
-        disable_custom_emoji_html: "%{name} desabilitou o emoji %{target}"
-        disable_user_html: "%{name} desativou o acesso para o utilizador %{target}"
+        disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} desativou o token de autenticação por e-mail para %{target}"
+        disable_user_html: "%{name} desativou o início de sessão para o utilizador %{target}"
         enable_custom_emoji_html: "%{name} ativou o emoji %{target}"
-        enable_user_html: "%{name} ativou o acesso para o utilizador %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} ativou o token de autenticação por e-mail para %{target}"
+        enable_user_html: "%{name} ativou o início de sessão para o utilizador %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o utilizador %{target}"
         reject_appeal_html: "%{name} rejeitou recurso da decisão de moderação de %{target}"
@@ -352,7 +373,7 @@ pt-PT:
       title: Painel de controlo
       top_languages: Principais idiomas ativos
       top_servers: Servidores mais ativos
-      website: Página na teia
+      website: Website
     disputes:
       appeals:
         empty: Nenhum recurso encontrado.
@@ -669,39 +690,39 @@ pt-PT:
       privileges:
         administrator: Administrador
         administrator_description: Utilizadores com esta permissão irão contornar todas as permissões
-        delete_user_data: Eliminar Dados de Utilizador
+        delete_user_data: Eliminar dados de utilizador
         delete_user_data_description: Permite que os utilizadores eliminem os dados doutros utilizadores sem tempo de espera
-        invite_users: Convidar Utilizadores
+        invite_users: Convidar utilizadores
         invite_users_description: Permite aos utilizadores convidar pessoas novas para o servidor
         manage_announcements: Gerir comunicados
         manage_announcements_description: Permite aos utilizadores gerirem os comunicados no servidor
         manage_appeals: Gerir apelos
         manage_appeals_description: Permite aos utilizadores rever recursos de moderação
-        manage_blocks: Gerir Bloqueios
-        manage_custom_emojis: Gerir Emojis Personalizados
+        manage_blocks: Gerir bloqueios
+        manage_custom_emojis: Gerir emojis personalizados
         manage_custom_emojis_description: Permite aos utilizadores gerirem os emojis personalizados do servidor
-        manage_federation: Gerir Federação
+        manage_federation: Gerir federação
         manage_federation_description: Permite aos utilizadores bloquear ou permitir federação com outros domínios e controlar a entregabilidade
-        manage_invites: Gerir Convites
+        manage_invites: Gerir convites
         manage_invites_description: Permite aos utilizadores pesquisarem e desativarem ligações de convite
-        manage_reports: Gerir Relatórios
-        manage_reports_description: Permite aos utilizadores rever relatórios e executar ações de moderação contra eles
-        manage_roles: Gerir Funções
+        manage_reports: Gerir denúncias
+        manage_reports_description: Permite aos utilizadores rever denúncias e executar ações de moderação contra eles
+        manage_roles: Gerir funções
         manage_roles_description: Permite aos utilizadores a gestão e atribuição de funções abaixo dos seus
-        manage_rules: Gerir Regras
+        manage_rules: Gerir regras
         manage_rules_description: Permite aos utilizadores alterar as regras do servidor
-        manage_settings: Gerir Configurações
-        manage_settings_description: Permite aos utilizadores alterar as configurações do sítio na teia
-        manage_taxonomies: Gerir Taxonomias
+        manage_settings: Gerir configurações
+        manage_settings_description: Permite aos utilizadores alterar as configurações do site
+        manage_taxonomies: Gerir taxonomias
         manage_taxonomies_description: Permite aos utilizadores rever o conteúdo em tendência e atualizar as configurações de hashtag
-        manage_user_access: Gerir Acesso de Utilizador
-        manage_users: Gerir Utilizadores
+        manage_user_access: Gerir acesso de utilizador
+        manage_users: Gerir utilizadores
         manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles
-        manage_webhooks: Gerir Webhooks
+        manage_webhooks: Gerir webhooks
         manage_webhooks_description: Permite aos utilizadores configurar webhooks para eventos administrativos
-        view_audit_log: Ver Registo de Auditoria
+        view_audit_log: Ver registo de auditoria
         view_audit_log_description: Permite aos utilizadores ver um histórico de ações administrativas no servidor
-        view_dashboard: Ver Painel de Controlo
+        view_dashboard: Ver painel de controlo
         view_dashboard_description: Permite aos utilizadores acederem ao painel de controlo e a várias estatísticas
         view_devops: DevOps
         view_devops_description: Permite aos utilizadores aceder aos painéis de controlo do Sidekiq e pgHero
@@ -723,14 +744,14 @@ pt-PT:
         preamble: Personalize a interface web do Mastodon.
         title: Aspeto
       branding:
-        preamble: A marca do seu servidor diferencia-a doutros servidores na rede. Essa informação pode ser exibida em vários contexos, como a interface na teia do Mastodon, aplicações nativas, visualizações de hiperligações noutros sites, em aplicações de mensagens, etc. Por esta razão, é melhor manter esta informação clara, curta e concisa.
+        preamble: A marca do seu servidor diferencia-a de outros servidores na rede. Essa informação pode ser mostrada em vários ambientes, como a interface web do Mastodon, aplicações nativas, visualizações de hiperligações em outros sites e dentro de aplicações de mensagens, etc. Por esta razão, é melhor manter esta informação clara, curta e concisa.
         title: Marca
       captcha_enabled:
         desc_html: Isto depende de scripts externos da hCaptcha, o que pode ser uma preocupação de segurança e privacidade. Além disso, <strong>isto pode tornar o processo de registo menos acessível para algumas pessoas (especialmente as com limitações físicas)</strong>. Por isso, considere medidas alternativas tais como registo mediante aprovação ou sob convite.
         title: Requerer que novos utilizadores resolvam um CAPTCHA para confirmar a sua conta
       content_retention:
         danger_zone: Zona de perigo
-        preamble: Controle como o conteúdo gerado pelos utilizadores é armazenado no Mastodon.
+        preamble: Controle a forma como o conteúdo gerado pelo utilizador é armazenado no Mastodon.
         title: Retenção de conteúdo
       default_noindex:
         desc_html: Afeta todos os utilizadores que não alteraram esta configuração
@@ -1198,7 +1219,7 @@ pt-PT:
       content: Desculpe, mas algo correu mal da nossa parte.
       title: Esta página não está correta
     '503': A página não pôde ser apresentada devido a uma falha temporária do servidor.
-    noscript_html: Para usar a aplicação da teia do Mastodon, por favor active o JavaScript. Em alternativa, experimenta uma das <a href="%{apps_path}">aplicações nativas</a> do Mastodon para a sua plataforma.
+    noscript_html: Para usar a aplicação web do Mastodon, ative o JavaScript. Alternativamente, experimente uma das <a href="%{apps_path}">aplicações nativas</a> para o Mastodon na sua plataforma.
   existing_username_validator:
     not_found: não foi possível encontrar um utilizador local com esse nome
     not_found_multiple: não foi possível encontrar %{usernames}
@@ -1236,7 +1257,7 @@ pt-PT:
       statuses_hint_html: Este filtro aplica-se a publicações individuais selecionadas independentemente de estas corresponderem às palavras-chave abaixo. <a href="%{path}">Reveja ou remova publicações do filtro</a>.
       title: Editar filtros
     errors:
-      deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir desta aplicação porque se aplicam a mais que um filtro de palavra-chave. Use uma aplicação mais recente ou a interface na teia.
+      deprecated_api_multiple_keywords: Estes parâmetros não podem ser alterados a partir desta aplicação porque se aplicam a mais de um filtro de palavra-chave. Use uma aplicação mais recente ou a interface web.
       invalid_context: Inválido ou nenhum contexto fornecido
     index:
       contexts: Filtros em %{contexts}
@@ -1664,7 +1685,7 @@ pt-PT:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação a que está a tentar responder parece não existir.
-    open_in_web: Abrir na Teia
+    open_in_web: Abrir na web
     over_character_limit: limite de caracter excedeu %{max}
     pin_errors:
       direct: Publicações visíveis apenas para utilizadores mencionados não podem ser afixadas
@@ -1826,7 +1847,7 @@ pt-PT:
     welcome:
       apps_android_action: Baixe no Google Play
       apps_ios_action: Baixar na App Store
-      apps_step: Baixe nossos aplicativos oficiais.
+      apps_step: Descarregue as nossas aplicações oficiais.
       apps_title: Apps Mastodon
       checklist_subtitle: 'Vamos começar nesta nova fronteira social:'
       checklist_title: Checklist de Boas-vindas
@@ -1835,11 +1856,11 @@ pt-PT:
       edit_profile_title: Personalize seu perfil
       explanation: Aqui estão algumas dicas para começar
       feature_action: Mais informações
-      feature_audience: Mastodon oferece uma possibilidade única de gerenciar seu público sem intermediários. O Mastodon implantado em sua própria infraestrutura permite que você siga e seja seguido de qualquer outro servidor Mastodon online e não esteja sob o controle de ninguém além do seu.
+      feature_audience: O Mastodon oferece-lhe uma possibilidade única de gerir a sua audiência sem intermediários. O Mastodon implantado na sua própria infraestrutura permite-lhe seguir e ser seguido a partir de qualquer outro servidor Mastodon online e não está sob o controlo de ninguém a não ser o seu.
       feature_audience_title: Construa seu público em confiança
-      feature_control: Você sabe melhor o que deseja ver no feed da sua casa. Sem algoritmos ou anúncios para desperdiçar seu tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba suas postagens em ordem cronológica, deixando seu canto da internet um pouco mais parecido com você.
-      feature_control_title: Fique no controle da sua própria linha do tempo
-      feature_creativity: Mastodon suporta postagens de áudio, vídeo e imagens, descrições de acessibilidade, enquetes, avisos de conteúdo, avatares animados, emojis personalizados, controle de corte de miniaturas e muito mais, para ajudá-lo a se expressar online. Esteja você publicando sua arte, sua música ou seu podcast, o Mastodon está lá para você.
+      feature_control: Você sabe melhor o que quer ver no seu feed. Não há algoritmos ou anúncios que o façam perder tempo. Siga qualquer pessoa em qualquer servidor Mastodon a partir de uma única conta e receba as suas mensagens por ordem cronológica e torne o seu canto da Internet um pouco mais parecido consigo.
+      feature_control_title: Mantenha o controlo da sua própria cronologia
+      feature_creativity: O Mastodon suporta publicações de áudio, vídeo e imagens, descrições de acessibilidade, sondagens, avisos de conteúdo, avatares animados, emojis personalizados, controlo de corte de miniaturas e muito mais, para o ajudar a expressar-se online. Quer esteja a publicar a sua arte, a sua música ou o seu podcast, o Mastodon está lá para si.
       feature_creativity_title: Criatividade inigualável
       feature_moderation: Mastodon coloca a tomada de decisões de volta em suas mãos. Cada servidor cria as suas próprias regras e regulamentos, que são aplicados localmente e não de cima para baixo como as redes sociais corporativas, tornando-o mais flexível na resposta às necessidades de diferentes grupos de pessoas. Junte-se a um servidor com as regras com as quais você concorda ou hospede as suas próprias.
       feature_moderation_title: Moderando como deve ser
@@ -1856,7 +1877,7 @@ pt-PT:
       hashtags_title: Etiquetas em tendência
       hashtags_view_more: Ver mais etiquetas em tendência
       post_action: Compor
-      post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
+      post_step: Diga olá para o mundo com texto, fotos, vídeos ou sondagens.
       post_title: Faça a sua primeira publicação
       share_action: Compartilhar
       share_step: Diga aos seus amigos como te encontrar no Mastodon.
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index f595a31997..26edab3b2e 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -130,6 +130,7 @@ he:
         name: ניתן רק להחליף בין אותיות קטנות וגדולות, למשל כדי לשפר את הקריאות
       user:
         chosen_languages: אם פעיל, רק הודעות בשפות הנבחרות יוצגו לפידים הפומביים
+        role: התפקיד שולט על אילו הרשאות יש למשתמש.
       user_role:
         color: צבע לתפקיד בממשק המשתמש, כ RGB בפורמט הקסדצימלי
         highlighted: מאפשר נראות ציבורית של התפקיד
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index ecbf501389..99cb269e37 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -101,6 +101,7 @@ lt:
         show_application: Neatsižvelgiant į tai, visada galėsi matyti, kuri programėlė paskelbė tavo įrašą.
       user:
         chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis.
+        role: Vaidmuo valdo, kokius leidimus naudotojas turi.
     labels:
       account:
         discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 7419169890..b113e0eed5 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -130,6 +130,7 @@ pl:
         name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
       user:
         chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
+        role: Rola kontroluje uprawnienia użytkownika.
       user_role:
         color: Kolor używany dla roli w całym interfejsie użytkownika, wyrażony jako RGB w formacie szesnastkowym
         highlighted: To sprawia, że rola jest widoczna publicznie
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 971773b2dc..3b606df032 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -77,7 +77,7 @@ pt-PT:
           warn: Ocultar o conteúdo filtrado por trás de um aviso mencionando o título do filtro
       form_admin_settings:
         activity_api_enabled: Contagem, em blocos semanais, de publicações locais, utilizadores ativos e novos registos
-        app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão do aplicativo em dispositivos móveis por um ícone personalizado.
+        app_icon: WEBP, PNG, GIF ou JPG. Substitui o ícone padrão da aplicação em dispositivos móveis por um ícone personalizado.
         backups_retention_period: Os utilizadores têm a possibilidade de gerar arquivos das suas mensagens para descarregar mais tarde. Quando definido para um valor positivo, estes arquivos serão automaticamente eliminados do seu armazenamento após o número de dias especificado.
         bootstrap_timeline_accounts: Estas contas serão destacadas no topo das recomendações aos novos utilizadores.
         closed_registrations_message: Apresentado quando as inscrições estiverem encerradas
@@ -130,12 +130,13 @@ pt-PT:
         name: Só pode alterar a capitalização das letras, por exemplo, para torná-las mais legíveis
       user:
         chosen_languages: Quando selecionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
+        role: A função controla as permissões que o utilizador tem.
       user_role:
         color: Cor a ser utilizada para a função em toda a interface de utilizador, como RGB no formato hexadecimal
         highlighted: Isto torna a função visível publicamente
-        name: Nome público do cargo, se este estiver definido para ser apresentada com um emblema
+        name: Nome público da função, se esta estiver definida para ser apresentada com um emblema
         permissions_as_keys: Utilizadores com esta função terão acesso a...
-        position: Cargos mais altos decidem a resolução de conflitos em certas situações. Certas ações só podem ser executadas em cargos com uma menor prioridade
+        position: Funções mais altas decidem a resolução de conflitos em certas situações. Certas ações só podem ser executadas com certas funções com uma menor prioridade
       webhook:
         events: Selecione os eventos a enviar
         template: Componha o seu próprio conteúdo JSON utilizando a interpolação de variáveis. Deixar em branco para o JSON predefinido.
@@ -315,7 +316,7 @@ pt-PT:
         trendable: Permitir que esta etiqueta apareça nas tendências
         usable: Permitir que as publicações usem esta hashtag localmente
       user:
-        role: Cargo
+        role: Função
         time_zone: Fuso horário
       user_role:
         color: Cor do emblema
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 89fb1675fd..2fcf23b156 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -130,6 +130,7 @@ tr:
         name: Harflerin, örneğin daha okunabilir yapmak için, sadece büyük/küçük harf durumlarını değiştirebilirsiniz
       user:
         chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki gönderiler genel zaman çizelgelerinde görüntülenir
+        role: Rol, kullanıcıların sahip olduğu izinleri denetler.
       user_role:
         color: Arayüz boyunca rol için kullanılacak olan renk, hex biçiminde RGB
         highlighted: Bu rolü herkese açık hale getirir
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 0f43f43988..6907c1ee3c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -25,7 +25,6 @@ sq:
   admin:
     account_actions:
       action: Kryeje veprimin
-      already_silenced: Kjo llogari është heshtuar tashmë.
       already_suspended: Kjo llogari është pezulluar tashmë.
       title: Kryeni veprim moderimi te %{acct}
     account_moderation_notes:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index bcf1e3b816..df403e602a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -25,6 +25,7 @@ sv:
   admin:
     account_actions:
       action: Utför åtgärd
+      already_silenced: Detta konto är redan begränsat.
       title: Utför aktivitet för moderering på %{acct}
     account_moderation_notes:
       create: Lämna kommentar
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f119102112..f409a512d9 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -23,7 +23,6 @@ th:
   admin:
     account_actions:
       action: ทำการกระทำ
-      already_silenced: มีการทำให้บัญชีนี้เงียบไปแล้ว
       already_suspended: มีการระงับบัญชีนี้ไปแล้ว
       title: ทำการกระทำการกลั่นกรองต่อ %{acct}
     account_moderation_notes:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4318f4eac4..d2d499077d 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -25,6 +25,8 @@ tr:
   admin:
     account_actions:
       action: Eylemi gerçekleştir
+      already_silenced: Bu hesap zaten askıya alınmış.
+      already_suspended: Bu hesap zaten askıya alınmış.
       title: "%{acct} üzerinde denetleme eylemi gerçekleştir"
     account_moderation_notes:
       create: Not bırak
@@ -46,6 +48,7 @@ tr:
         title: "%{username} için e-postayı değiştir"
       change_role:
         changed_msg: Rol başarıyla değiştirildi!
+        edit_roles: Kullanıcı rollerini yönetin
         label: Rolü değiştir
         no_role: Rol yok
         title: "%{username} için rolü değiştir"
@@ -602,6 +605,7 @@ tr:
         suspend_description_html: Bu hesap ve tüm içeriği erişilmez olacak ve nihayetinde silinecek ve bu hesapla etkileşim mümkün olmayacaktır. 30 gün içinde geri alınabilir. Bu hesaba yönelik tüm bildiriimleri kapatır.
       actions_description_html: Bu bildirimi çözmek için ne yapılması gerektiğine karar verin. Bildirilen hesap için ceza işlemi yaparsanız, <strong>İstenmeyen</strong> kategorisi seçilmemişse, onlara bir e-posta duyurusu gönderilecektir.
       actions_description_remote_html: Bu bildirimi çözmek için hangi eylemi yapmak istediğinize karar verin. Bu yalnızca <strong>sizin</strong> sunucunuzun bu uzak hesapla nasıl etkileşeğini ve içeriğiyle ne yapacağını etkiler.
+      actions_no_posts: Bu raporun ilişkili olduğu silinecek gönderi yok
       add_to_report: Bildirime daha fazlasını ekle
       already_suspended_badges:
         local: Bu sunucuda zaten askıya alınmış
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 261c87cd75..4e70b192d9 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -628,6 +628,7 @@ uk:
         suspend_description_html: Обліковий запис і весь його вміст будуть недоступними й врешті-решт видалені, і взаємодіяти з ним буде неможливо. Відновлення можливе протягом 30 днів. Закриває всі скарги на цей обліковий запис.
       actions_description_html: Визначте, які дії слід вжити для розв'язання цієї скарги. Якщо ви оберете каральні дії проти зареєстрованого облікового запису, про них буде надіслано сповіщення електронним листом, крім випадків, коли вибрано категорію <strong>Спам</strong>.
       actions_description_remote_html: Визначте, які дії слід вжити для розв'язання цього звіту. Це вплине тільки на те, як <strong>ваш</strong> сервер з'єднується з цим віддаленим обліковим записом і обробляє його вміст.
+      actions_no_posts: Ця скарга не має жодних пов'язаних дописів для видалення
       add_to_report: Додати ще подробиць до скарги
       already_suspended_badges:
         local: Вже призупинено на цьому сервері
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 975df3024b..d211b9e740 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -23,7 +23,6 @@ vi:
   admin:
     account_actions:
       action: Thực hiện hành động
-      already_silenced: Tài khoản này đã bị hạn chế.
       already_suspended: Tài khoản này đã bị vô hiệu hóa.
       title: Áp đặt kiểm duyệt với %{acct}
     account_moderation_notes:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6b399d3499..7407d81db9 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -23,7 +23,7 @@ zh-CN:
   admin:
     account_actions:
       action: 执行操作
-      already_silenced: 此帐户已受限。
+      already_silenced: 此账户已受限。
       already_suspended: 此帐户已被封禁。
       title: 在 %{acct} 上执行管理操作
     account_moderation_notes:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8288e9bfac..d92d53f391 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -23,7 +23,7 @@ zh-TW:
   admin:
     account_actions:
       action: 執行動作
-      already_silenced: 此帳號已被靜音。
+      already_silenced: 此帳號已被限制。
       already_suspended: 此帳號已被停權。
       title: 對 %{acct} 執行站務動作
     account_moderation_notes:
@@ -1269,7 +1269,7 @@ zh-TW:
       home: 首頁時間軸
       notifications: 通知
       public: 公開時間軸
-      thread: 對話
+      thread: 討論串
     edit:
       add_keyword: 新增關鍵字
       keywords: 關鍵字

From 3929e3c6d21226ad42f743a283576004d9c1c7eb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 10 Sep 2024 11:29:17 +0200
Subject: [PATCH 07/89] Change design of hide media button in web UI (#31807)

---
 .../mastodon/components/media_gallery.jsx     | 32 +++++-----
 app/javascript/mastodon/locales/en.json       |  2 +-
 .../styles/mastodon/components.scss           | 60 +++++++++++--------
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index ed4805b05d..9a8f852128 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
@@ -10,17 +10,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { debounce } from 'lodash';
 
-import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 
 import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
 
-import { IconButton } from './icon_button';
-
-const messages = defineMessages({
-  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: '{number, plural, one {Hide image} other {Hide images}}' },
-});
-
 class Item extends PureComponent {
 
   static propTypes = {
@@ -215,7 +208,6 @@ class MediaGallery extends PureComponent {
     size: PropTypes.object,
     height: PropTypes.number.isRequired,
     onOpenMedia: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
     defaultWidth: PropTypes.number,
     cacheWidth: PropTypes.func,
     visible: PropTypes.bool,
@@ -291,7 +283,7 @@ class MediaGallery extends PureComponent {
   }
 
   render () {
-    const { media, lang, intl, sensitive, defaultWidth, autoplay } = this.props;
+    const { media, lang, sensitive, defaultWidth, autoplay } = this.props;
     const { visible } = this.state;
     const width = this.state.width || defaultWidth;
 
@@ -323,9 +315,7 @@ class MediaGallery extends PureComponent {
           </span>
         </button>
       );
-    } else if (visible) {
-      spoilerButton = <IconButton title={intl.formatMessage(messages.toggle_visible, { number: size })} icon='eye-slash' iconComponent={VisibilityOffIcon} overlay onClick={this.handleOpen} ariaHidden />;
-    } else {
+    } else if (!visible) {
       spoilerButton = (
         <button type='button' onClick={this.handleOpen} className='spoiler-button__overlay'>
           <span className='spoiler-button__overlay__label'>
@@ -338,15 +328,23 @@ class MediaGallery extends PureComponent {
 
     return (
       <div className='media-gallery' style={style} ref={this.handleRef}>
-        <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached, 'spoiler-button--click-thru': uncached })}>
-          {spoilerButton}
-        </div>
+        {(!visible || uncached) && (
+          <div className={classNames('spoiler-button', { 'spoiler-button--click-thru': uncached })}>
+            {spoilerButton}
+          </div>
+        )}
 
         {children}
+
+        {(visible && !uncached) && (
+          <div className='media-gallery__actions'>
+            <button className='media-gallery__actions__pill' onClick={this.handleOpen}><FormattedMessage id='media_gallery.hide' defaultMessage='Hide' /></button>
+          </div>
+        )}
       </div>
     );
   }
 
 }
 
-export default injectIntl(MediaGallery);
+export default MediaGallery;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 7c1d7f126d..39ee7b858f 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading…",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "media_gallery.hide": "Hide",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Hide from notifications",
   "mute_modal.hide_options": "Hide options",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 92d2034633..570c006faa 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4718,22 +4718,14 @@ a.status-card {
   position: absolute;
   z-index: 100;
 
-  &--minified {
-    display: block;
-    inset-inline-start: 4px;
-    top: 4px;
-    width: auto;
-    height: auto;
+  &--hidden {
+    display: none;
   }
 
   &--click-thru {
     pointer-events: none;
   }
 
-  &--hidden {
-    display: none;
-  }
-
   &__overlay {
     display: flex;
     align-items: center;
@@ -4745,19 +4737,20 @@ a.status-card {
     margin: 0;
     border: 0;
     color: $white;
+    line-height: 20px;
+    font-size: 14px;
 
     &__label {
       background-color: rgba($black, 0.45);
       backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
-      border-radius: 6px;
-      padding: 10px 15px;
+      border-radius: 8px;
+      padding: 12px 16px;
       display: flex;
       align-items: center;
       justify-content: center;
-      gap: 8px;
+      gap: 4px;
       flex-direction: column;
-      font-weight: 500;
-      font-size: 14px;
+      font-weight: 600;
     }
 
     &__action {
@@ -6838,10 +6831,32 @@ a.status-card {
   z-index: 9999;
 }
 
-.media-gallery__item__badges {
+.media-gallery__actions {
   position: absolute;
   bottom: 6px;
-  inset-inline-start: 6px;
+  inset-inline-end: 6px;
+  display: flex;
+  gap: 2px;
+  z-index: 2;
+
+  &__pill {
+    display: block;
+    color: $white;
+    border: 0;
+    background: rgba($black, 0.65);
+    backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+    padding: 3px 12px;
+    border-radius: 99px;
+    font-size: 14px;
+    font-weight: 700;
+    line-height: 20px;
+  }
+}
+
+.media-gallery__item__badges {
+  position: absolute;
+  bottom: 8px;
+  inset-inline-start: 8px;
   display: flex;
   gap: 2px;
 }
@@ -6854,18 +6869,13 @@ a.status-card {
   color: $white;
   background: rgba($black, 0.65);
   backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
-  padding: 2px 6px;
+  padding: 3px 8px;
   border-radius: 4px;
-  font-size: 11px;
+  font-size: 12px;
   font-weight: 700;
   z-index: 1;
   pointer-events: none;
-  line-height: 18px;
-
-  .icon {
-    width: 15px;
-    height: 15px;
-  }
+  line-height: 20px;
 }
 
 .attachment-list {

From e0c27a504788bdc6cd518072e557313e4ec5ee7a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 10 Sep 2024 14:00:40 +0200
Subject: [PATCH 08/89] Add ability to manage which websites can credit you in
 link previews (#31819)

---
 .../settings/verifications_controller.rb      |  20 ++-
 app/helpers/context_helper.rb                 |   1 +
 app/javascript/styles/mastodon/forms.scss     |  35 +++++
 app/models/account.rb                         |   2 +
 .../concerns/account/attribution_domains.rb   |  25 ++++
 .../activitypub/actor_serializer.rb           |   3 +-
 .../activitypub/process_account_service.rb    |   1 +
 app/services/fetch_link_card_service.rb       |   7 +-
 app/validators/domain_validator.rb            |  21 ++-
 app/validators/lines_validator.rb             |   9 ++
 .../settings/verifications/show.html.haml     |  34 ++++-
 config/locales/activerecord.en.yml            |   6 +
 config/locales/an.yml                         |   2 -
 config/locales/ar.yml                         |   2 -
 config/locales/be.yml                         |   2 -
 config/locales/bg.yml                         |   2 -
 config/locales/ca.yml                         |   2 -
 config/locales/ckb.yml                        |   2 -
 config/locales/co.yml                         |   2 -
 config/locales/cs.yml                         |   2 -
 config/locales/cy.yml                         |   2 -
 config/locales/da.yml                         |   2 -
 config/locales/de.yml                         |   2 -
 config/locales/el.yml                         |   2 -
 config/locales/en-GB.yml                      |   2 -
 config/locales/en.yml                         |   9 +-
 config/locales/eo.yml                         |   2 -
 config/locales/es-AR.yml                      |   2 -
 config/locales/es-MX.yml                      |   2 -
 config/locales/es.yml                         |   2 -
 config/locales/et.yml                         |   2 -
 config/locales/eu.yml                         |   2 -
 config/locales/fa.yml                         |   2 -
 config/locales/fi.yml                         |   2 -
 config/locales/fo.yml                         |   2 -
 config/locales/fr-CA.yml                      |   2 -
 config/locales/fr.yml                         |   2 -
 config/locales/fy.yml                         |   2 -
 config/locales/ga.yml                         |   2 -
 config/locales/gd.yml                         |   2 -
 config/locales/gl.yml                         |   2 -
 config/locales/he.yml                         |   2 -
 config/locales/hu.yml                         |   2 -
 config/locales/hy.yml                         |   2 -
 config/locales/ia.yml                         |   2 -
 config/locales/id.yml                         |   2 -
 config/locales/ie.yml                         |   2 -
 config/locales/io.yml                         |   2 -
 config/locales/is.yml                         |   2 -
 config/locales/it.yml                         |   2 -
 config/locales/ja.yml                         |   2 -
 config/locales/kk.yml                         |   2 -
 config/locales/ko.yml                         |   2 -
 config/locales/ku.yml                         |   2 -
 config/locales/lad.yml                        |   2 -
 config/locales/lv.yml                         |   2 -
 config/locales/ms.yml                         |   2 -
 config/locales/my.yml                         |   2 -
 config/locales/nl.yml                         |   2 -
 config/locales/nn.yml                         |   2 -
 config/locales/no.yml                         |   2 -
 config/locales/oc.yml                         |   2 -
 config/locales/pl.yml                         |   2 -
 config/locales/pt-BR.yml                      |   2 -
 config/locales/pt-PT.yml                      |   2 -
 config/locales/ru.yml                         |   2 -
 config/locales/sc.yml                         |   2 -
 config/locales/sco.yml                        |   2 -
 config/locales/si.yml                         |   2 -
 config/locales/simple_form.en.yml             |   2 +
 config/locales/sk.yml                         |   2 -
 config/locales/sl.yml                         |   2 -
 config/locales/sq.yml                         |   2 -
 config/locales/sr-Latn.yml                    |   2 -
 config/locales/sr.yml                         |   2 -
 config/locales/sv.yml                         |   2 -
 config/locales/th.yml                         |   2 -
 config/locales/tr.yml                         |   2 -
 config/locales/uk.yml                         |   2 -
 config/locales/vi.yml                         |   2 -
 config/locales/zh-CN.yml                      |   2 -
 config/locales/zh-HK.yml                      |   2 -
 config/locales/zh-TW.yml                      |   2 -
 config/routes/settings.rb                     |   2 +-
 ...637_add_attribution_domains_to_accounts.rb |   7 +
 db/schema.rb                                  |   3 +-
 .../settings/migrations_controller_spec.rb    |   1 +
 spec/models/account_spec.rb                   |  16 +++
 .../process_account_service_spec.rb           |  20 +++
 spec/services/bulk_import_service_spec.rb     |   8 +-
 spec/validators/domain_validator_spec.rb      | 125 ++++++++++++++++++
 spec/validators/lines_validator_spec.rb       |  46 +++++++
 92 files changed, 381 insertions(+), 160 deletions(-)
 create mode 100644 app/models/concerns/account/attribution_domains.rb
 create mode 100644 app/validators/lines_validator.rb
 create mode 100644 db/migrate/20240909014637_add_attribution_domains_to_accounts.rb
 create mode 100644 spec/validators/domain_validator_spec.rb
 create mode 100644 spec/validators/lines_validator_spec.rb

diff --git a/app/controllers/settings/verifications_controller.rb b/app/controllers/settings/verifications_controller.rb
index fc4f23bb18..4e0663253c 100644
--- a/app/controllers/settings/verifications_controller.rb
+++ b/app/controllers/settings/verifications_controller.rb
@@ -2,14 +2,30 @@
 
 class Settings::VerificationsController < Settings::BaseController
   before_action :set_account
+  before_action :set_verified_links
 
-  def show
-    @verified_links = @account.fields.select(&:verified?)
+  def show; end
+
+  def update
+    if UpdateAccountService.new.call(@account, account_params)
+      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      redirect_to settings_verification_path, notice: I18n.t('generic.changes_saved_msg')
+    else
+      render :show
+    end
   end
 
   private
 
+  def account_params
+    params.require(:account).permit(:attribution_domains_as_text)
+  end
+
   def set_account
     @account = current_account
   end
+
+  def set_verified_links
+    @verified_links = @account.fields.select(&:verified?)
+  end
 end
diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index cbefe0fe53..a0c1781d24 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -41,6 +41,7 @@ module ContextHelper
       'cipherText' => 'toot:cipherText',
     },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
+    attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
   }.freeze
 
   def full_context
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 926df4e96f..56f7b893f3 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -12,6 +12,41 @@ code {
   margin: 50px auto;
 }
 
+.form-section {
+  border-radius: 8px;
+  background: var(--surface-background-color);
+  padding: 24px;
+  margin-bottom: 24px;
+}
+
+.fade-out-top {
+  position: relative;
+  overflow: hidden;
+  height: 160px;
+
+  &::after {
+    content: '';
+    display: block;
+    background: linear-gradient(
+      to bottom,
+      var(--surface-background-color),
+      transparent
+    );
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100px;
+    pointer-events: none;
+  }
+
+  & > div {
+    position: absolute;
+    inset-inline-start: 0;
+    bottom: 0;
+  }
+}
+
 .indicator-icon {
   display: flex;
   align-items: center;
diff --git a/app/models/account.rb b/app/models/account.rb
index 4a7c752e7c..0a2cff2fe8 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -51,6 +51,7 @@
 #  reviewed_at                   :datetime
 #  requested_review_at           :datetime
 #  indexable                     :boolean          default(FALSE), not null
+#  attribution_domains           :string           default([]), is an Array
 #
 
 class Account < ApplicationRecord
@@ -88,6 +89,7 @@ class Account < ApplicationRecord
   include Account::Merging
   include Account::Search
   include Account::StatusesSearch
+  include Account::AttributionDomains
   include DomainMaterializable
   include DomainNormalizable
   include Paginable
diff --git a/app/models/concerns/account/attribution_domains.rb b/app/models/concerns/account/attribution_domains.rb
new file mode 100644
index 0000000000..37a498a150
--- /dev/null
+++ b/app/models/concerns/account/attribution_domains.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Account::AttributionDomains
+  extend ActiveSupport::Concern
+
+  included do
+    validates :attribution_domains_as_text, domain: { multiline: true }, lines: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? }
+  end
+
+  def attribution_domains_as_text
+    self[:attribution_domains].join("\n")
+  end
+
+  def attribution_domains_as_text=(str)
+    self[:attribution_domains] = str.split.filter_map do |line|
+      line.strip.delete_prefix('*.')
+    end
+  end
+
+  def can_be_attributed_from?(domain)
+    segments = domain.split('.')
+    variants = segments.map.with_index { |_, i| segments[i..].join('.') }.to_set
+    self[:attribution_domains].to_set.intersect?(variants)
+  end
+end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 4ab48ff204..a6281e23b9 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -8,7 +8,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
                      :moved_to, :property_value, :discoverable, :olm, :suspended,
-                     :memorial, :indexable
+                     :memorial, :indexable, :attribution_domains
 
   attributes :id, :type, :following, :followers,
              :inbox, :outbox, :featured, :featured_tags,
@@ -25,6 +25,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   attribute :moved_to, if: :moved?
   attribute :also_known_as, if: :also_known_as?
   attribute :suspended, if: :suspended?
+  attribute :attribution_domains, if: -> { object.attribution_domains.any? }
 
   class EndpointsSerializer < ActivityPub::Serializer
     include RoutingHelper
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index b667e97f4d..1e2d614d72 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -117,6 +117,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.discoverable            = @json['discoverable'] || false
     @account.indexable               = @json['indexable'] || false
     @account.memorial                = @json['memorial'] || false
+    @account.attribution_domains     = as_array(@json['attributionDomains'] || []).map { |item| value_or_id(item) }
   end
 
   def set_fetchable_key!
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 36d5c490a6..7662fc1f29 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -153,12 +153,13 @@ class FetchLinkCardService < BaseService
     return if html.nil?
 
     link_details_extractor = LinkDetailsExtractor.new(@url, @html, @html_charset)
-    provider = PreviewCardProvider.matching_domain(Addressable::URI.parse(link_details_extractor.canonical_url).normalized_host)
-    linked_account = ResolveAccountService.new.call(link_details_extractor.author_account, suppress_errors: true) if link_details_extractor.author_account.present? && provider&.trendable?
+    domain = Addressable::URI.parse(link_details_extractor.canonical_url).normalized_host
+    provider = PreviewCardProvider.matching_domain(domain)
+    linked_account = ResolveAccountService.new.call(link_details_extractor.author_account, suppress_errors: true) if link_details_extractor.author_account.present?
 
     @card = PreviewCard.find_or_initialize_by(url: link_details_extractor.canonical_url) if link_details_extractor.canonical_url != @card.url
     @card.assign_attributes(link_details_extractor.to_preview_card_attributes)
-    @card.author_account = linked_account
+    @card.author_account = linked_account if linked_account&.can_be_attributed_from?(domain) || provider&.trendable?
     @card.save_with_optional_image! unless @card.title.blank? && @card.html.blank?
   end
 end
diff --git a/app/validators/domain_validator.rb b/app/validators/domain_validator.rb
index 3a951f9a7e..718fd190f1 100644
--- a/app/validators/domain_validator.rb
+++ b/app/validators/domain_validator.rb
@@ -1,22 +1,29 @@
 # frozen_string_literal: true
 
 class DomainValidator < ActiveModel::EachValidator
+  MAX_DOMAIN_LENGTH = 256
+  MIN_LABEL_LENGTH = 1
+  MAX_LABEL_LENGTH = 63
+  ALLOWED_CHARACTERS_RE = /^[a-z0-9\-]+$/i
+
   def validate_each(record, attribute, value)
     return if value.blank?
 
-    domain = if options[:acct]
-               value.split('@').last
-             else
-               value
-             end
+    (options[:multiline] ? value.split : [value]).each do |domain|
+      _, domain = domain.split('@') if options[:acct]
 
-    record.errors.add(attribute, I18n.t('domain_validator.invalid_domain')) unless compliant?(domain)
+      next if domain.blank?
+
+      record.errors.add(attribute, options[:multiline] ? :invalid_domain_on_line : :invalid, value: domain) unless compliant?(domain)
+    end
   end
 
   private
 
   def compliant?(value)
-    Addressable::URI.new.tap { |uri| uri.host = value }
+    uri = Addressable::URI.new
+    uri.host = value
+    uri.normalized_host.size < MAX_DOMAIN_LENGTH && uri.normalized_host.split('.').all? { |label| label.size.between?(MIN_LABEL_LENGTH, MAX_LABEL_LENGTH) && label =~ ALLOWED_CHARACTERS_RE }
   rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
     false
   end
diff --git a/app/validators/lines_validator.rb b/app/validators/lines_validator.rb
new file mode 100644
index 0000000000..27a108bb2c
--- /dev/null
+++ b/app/validators/lines_validator.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class LinesValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    record.errors.add(attribute, :too_many_lines, limit: options[:maximum]) if options[:maximum].present? && value.split.size > options[:maximum]
+  end
+end
diff --git a/app/views/settings/verifications/show.html.haml b/app/views/settings/verifications/show.html.haml
index 4fb2918018..5318b0767d 100644
--- a/app/views/settings/verifications/show.html.haml
+++ b/app/views/settings/verifications/show.html.haml
@@ -5,7 +5,9 @@
   %h2= t('settings.profile')
   = render partial: 'settings/shared/profile_navigation'
 
-.simple_form
+.simple_form.form-section
+  %h3= t('verification.website_verification')
+
   %p.lead= t('verification.hint_html')
 
   %h4= t('verification.here_is_how')
@@ -28,3 +30,33 @@
           %span.verified-badge
             = material_symbol 'check', class: 'verified-badge__mark'
             %span= field.value
+
+= simple_form_for @account, url: settings_verification_path, html: { method: :put, class: 'form-section' } do |f|
+  = render 'shared/error_messages', object: @account
+
+  %h3= t('author_attribution.title')
+
+  %p.lead= t('author_attribution.hint_html')
+
+  .fields-row
+    .fields-row__column.fields-row__column-6
+      .fields-group
+        = f.input :attribution_domains_as_text, as: :text, wrapper: :with_block_label, input_html: { placeholder: "example1.com\nexample2.com\nexample3.com", rows: 4 }
+    .fields-row__column.fields-row__column-6
+      .fields-group.fade-out-top
+        %div
+          .status-card.expanded.bottomless
+            .status-card__image
+              = image_tag frontend_asset_url('images/preview.png'), alt: '', class: 'status-card__image-image'
+            .status-card__content
+              %span.status-card__host
+                %span= t('author_attribution.s_blog', name: @account.username)
+                ·
+                %time.time-ago{ datetime: 1.year.ago.to_date.iso8601 }
+              %strong.status-card__title= t('author_attribution.example_title')
+          .more-from-author
+            = logo_as_symbol(:icon)
+            = t('author_attribution.more_from_html', name: link_to(root_url, class: 'story__details__shared__author-link') { image_tag(@account.avatar.url, class: 'account__avatar', width: 16, height: 16, alt: '') + content_tag(:bdi, display_name(@account)) })
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index a53c7c6e9e..e135856036 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -15,6 +15,12 @@ en:
       user/invite_request:
         text: Reason
     errors:
+      attributes:
+        domain:
+          invalid: is not a valid domain name
+      messages:
+        invalid_domain_on_line: "%{value} is not a valid domain name"
+        too_many_lines: is over the limit of %{limit} lines
       models:
         account:
           attributes:
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 9afc9e881d..41eeee4614 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1017,8 +1017,6 @@ an:
       your_appeal_approved: S'aprebó la tuya apelación
       your_appeal_pending: Has ninviau una apelación
       your_appeal_rejected: La tuya apelación ha estau refusada
-  domain_validator:
-    invalid_domain: no ye un nombre de dominio valido
   errors:
     '400': La solicitut que has ninviau no ye valida u yera malformada.
     '403': No tiens permiso pa acceder ta esta pachina.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index ee05684b6c..06cea7ecb3 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1239,8 +1239,6 @@ ar:
       your_appeal_approved: تمت الموافقة على طعنك
       your_appeal_pending: لقد قمت بتقديم طعن
       your_appeal_rejected: تم رفض طعنك
-  domain_validator:
-    invalid_domain: ليس بإسم نطاق صالح
   edit_profile:
     basic_information: معلومات أساسية
     hint_html: "<strong>قم بتخصيص ما سيراه الناس في ملفك الشخصي العام وبجوار منشوراتك.</strong> من المرجح أن يتابعك أشخاص آخرون ويتفاعلون معك إن كان لديك صفحة شخصية مملوء وصورة."
diff --git a/config/locales/be.yml b/config/locales/be.yml
index fbeb55add7..31a31e9e61 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -1256,8 +1256,6 @@ be:
       your_appeal_approved: Ваша абскарджанне было ўхвалена
       your_appeal_pending: Вы адправілі апеляцыю
       your_appeal_rejected: Ваша абскарджанне было адхілена
-  domain_validator:
-    invalid_domain: не з'яўляецца сапраўдным даменным імем
   edit_profile:
     basic_information: Асноўная інфармацыя
     hint_html: "<strong>Наладзьце тое, што людзі будуць бачыць у вашым профілі і побач з вашымі паведамленнямі.</strong> Іншыя людзі з большай верагоднасцю будуць сачыць і ўзаемадзейнічаць з вамі, калі ў вас ёсць запоўнены профіль і фота профілю."
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 56ab759174..42a626c695 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1179,8 +1179,6 @@ bg:
       your_appeal_approved: Вашето обжалване е одобрено
       your_appeal_pending: Подадохте обжалване
       your_appeal_rejected: Вашето обжалване е отхвърлено
-  domain_validator:
-    invalid_domain: не е валидно име на домейн
   edit_profile:
     basic_information: Основна информация
     hint_html: "<strong>Персонализирайте какво хората виждат в обществения ви профил и до публикациите ви.</strong> Другите хора са по-склонни да ви последват и да взаимодействат с вас, когато имате попълнен профил и снимка на профила."
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 121266916f..e1025563eb 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1216,8 +1216,6 @@ ca:
       your_appeal_approved: La teva apel·lació s'ha aprovat
       your_appeal_pending: Has enviat una apel·lació
       your_appeal_rejected: La teva apel·lació ha estat rebutjada
-  domain_validator:
-    invalid_domain: no es un nom de domini vàlid
   edit_profile:
     basic_information: Informació bàsica
     hint_html: "<strong>Personalitza el que la gent veu en el teu perfil públic i a prop dels teus tuts..</strong> És més probable que altres persones et segueixin i interaccionin amb tu quan tens emplenat el teu perfil i amb la teva imatge."
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 15c5690cdd..3ecef4bb4d 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -646,8 +646,6 @@ ckb:
     strikes:
       title_actions:
         none: ئاگاداری
-  domain_validator:
-    invalid_domain: ناوی دۆمەین بڕوادار نییە
   errors:
     '400': داواکاریەکەی کە پێشکەشت کردووە نادروستە یان نەیپێکا.
     '403': تۆ مۆڵەتت نیە بۆ بینینی ئەم لاپەڕەیە.
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 5ee69ff8ad..7c0695a770 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -603,8 +603,6 @@ co:
       more_details_html: Per più di ditagli, videte a <a href="%{terms_path}">pulitica di vita privata</a>.
       username_available: U vostru cugnome riduvinterà dispunibule
       username_unavailable: U vostru cugnome ùn sarà sempre micca dispunibule
-  domain_validator:
-    invalid_domain: ùn hè micca un nome di duminiu currettu
   errors:
     '400': A richiesta mandata ùn era micca valida o curretta.
     '403': Ùn site micca auturizatu·a à vede sta pagina.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 98e2c30526..7d4d2296ca 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1213,8 +1213,6 @@ cs:
       your_appeal_approved: Vaše odvolání bylo schváleno
       your_appeal_pending: Podali jste odvolání
       your_appeal_rejected: Vaše odvolání bylo zamítnuto
-  domain_validator:
-    invalid_domain: není platné doménové jméno
   edit_profile:
     basic_information: Základní informace
     hint_html: "<strong>Nastavte si, co lidé uvidí na vašem veřejném profilu a vedle vašich příspěvků.</strong> Ostatní lidé vás budou spíše sledovat a komunikovat s vámi, když budete mít vyplněný profil a profilový obrázek."
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index b3886ffeb2..d317efad3f 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -1306,8 +1306,6 @@ cy:
       your_appeal_approved: Mae eich apêl wedi'i chymeradwyo
       your_appeal_pending: Rydych wedi cyflwyno apêl
       your_appeal_rejected: Mae eich apêl wedi'i gwrthod
-  domain_validator:
-    invalid_domain: ddim yn enw parth dilys
   edit_profile:
     basic_information: Gwybodaeth Sylfaenol
     hint_html: "<strong>Addaswch yr hyn y mae pobl yn ei weld ar eich proffil cyhoeddus ac wrth ymyl eich postiadau.</strong> Mae pobl eraill yn fwy tebygol o'ch dilyn yn ôl a rhyngweithio â chi pan fydd gennych broffil wedi'i lenwi a llun proffil."
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 89430e37ed..19ee9b9d81 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1235,8 +1235,6 @@ da:
       your_appeal_approved: Din appel er godkendt
       your_appeal_pending: Du har indgivet en appel
       your_appeal_rejected: Din appel er afvist
-  domain_validator:
-    invalid_domain: er ikke et gyldigt domænenavn
   edit_profile:
     basic_information: Oplysninger
     hint_html: "<strong>Tilpas hvad folk ser på din offentlige profil og ved siden af dine indlæg.</strong> Andre personer vil mere sandsynligt følge dig tilbage og interagere med dig, når du har en udfyldt profil og et profilbillede."
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 975ec517f7..b75aada764 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1234,8 +1234,6 @@ de:
       your_appeal_approved: Dein Einspruch wurde angenommen
       your_appeal_pending: Du hast Einspruch erhoben
       your_appeal_rejected: Dein Einspruch wurde abgelehnt
-  domain_validator:
-    invalid_domain: ist keine gültige Domain
   edit_profile:
     basic_information: Allgemeine Informationen
     hint_html: "<strong>Bestimme, was andere auf deinem öffentlichen Profil und neben deinen Beiträgen sehen können.</strong> Wenn du ein Profilbild festlegst und dein Profil vervollständigst, werden andere eher mit dir interagieren und dir folgen."
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 6b1d8bc0e5..3cb9075c38 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1192,8 +1192,6 @@ el:
       your_appeal_approved: Η έφεση σου έχει εγκριθεί
       your_appeal_pending: Υπέβαλλες έφεση
       your_appeal_rejected: Η έφεση σου απορρίφθηκε
-  domain_validator:
-    invalid_domain: δεν είναι έγκυρο όνομα τομέα
   edit_profile:
     basic_information: Βασικές πληροφορίες
     hint_html: "<strong>Τροποποίησε τί βλέπουν άτομα στο δημόσιο προφίλ σου και δίπλα στις αναρτήσεις σου.</strong> Είναι πιο πιθανό κάποιος να σε ακολουθήσει πίσω και να αλληλεπιδράσουν μαζί σου αν έχεις ολοκληρωμένο προφίλ και εικόνα προφίλ."
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index bcde9956c2..a3036c2f96 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1202,8 +1202,6 @@ en-GB:
       your_appeal_approved: Your appeal has been approved
       your_appeal_pending: You have submitted an appeal
       your_appeal_rejected: Your appeal has been rejected
-  domain_validator:
-    invalid_domain: is not a valid domain name
   edit_profile:
     basic_information: Basic information
     hint_html: "<strong>Customise what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 980bd481b1..05300acea5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1161,6 +1161,12 @@ en:
       view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
+  author_attribution:
+    example_title: Sample text
+    hint_html: Control how you're credited when links are shared on Mastodon.
+    more_from_html: More from %{name}
+    s_blog: "%{name}'s Blog"
+    title: Author attribution
   challenge:
     confirm: Continue
     hint_html: "<strong>Tip:</strong> We won't ask you for your password again for the next hour."
@@ -1235,8 +1241,6 @@ en:
       your_appeal_approved: Your appeal has been approved
       your_appeal_pending: You have submitted an appeal
       your_appeal_rejected: Your appeal has been rejected
-  domain_validator:
-    invalid_domain: is not a valid domain name
   edit_profile:
     basic_information: Basic information
     hint_html: "<strong>Customize what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
@@ -1952,6 +1956,7 @@ en:
     instructions_html: Copy and paste the code below into the HTML of your website. Then add the address of your website into one of the extra fields on your profile from the "Edit profile" tab and save changes.
     verification: Verification
     verified_links: Your verified links
+    website_verification: Website verification
   webauthn_credentials:
     add: Add new security key
     create:
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 85aa3a1f31..c1873c2f24 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1105,8 +1105,6 @@ eo:
       your_appeal_approved: Via apelacio aprobitas
       your_appeal_pending: Vi sendis apelacion
       your_appeal_rejected: Via apelacio malakceptitas
-  domain_validator:
-    invalid_domain: ne estas valida domajna nomo
   edit_profile:
     basic_information: Baza informo
     other: Alia
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index bd15c9862d..f4d88d7323 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1235,8 +1235,6 @@ es-AR:
       your_appeal_approved: Se aprobó tu apelación
       your_appeal_pending: Enviaste una apelación
       your_appeal_rejected: Se rechazó tu apelación
-  domain_validator:
-    invalid_domain: no es un nombre de dominio válido
   edit_profile:
     basic_information: Información básica
     hint_html: "<strong>Personalizá lo que la gente ve en tu perfil público y junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen con vos cuando tengas un perfil completo y una foto de perfil."
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 52e440ffed..84663aa895 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -1231,8 +1231,6 @@ es-MX:
       your_appeal_approved: Se aprobó tu apelación
       your_appeal_pending: Has enviado una apelación
       your_appeal_rejected: Tu apelación ha sido rechazada
-  domain_validator:
-    invalid_domain: no es un nombre de dominio válido
   edit_profile:
     basic_information: Información básica
     hint_html: "<strong>Personaliza lo que la gente ve en tu perfil público junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen contigo cuando completes tu perfil y agregues una foto."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 21b900192a..e245dde5d6 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1231,8 +1231,6 @@ es:
       your_appeal_approved: Se aprobó tu apelación
       your_appeal_pending: Has enviado una apelación
       your_appeal_rejected: Tu apelación ha sido rechazada
-  domain_validator:
-    invalid_domain: no es un nombre de dominio válido
   edit_profile:
     basic_information: Información básica
     hint_html: "<strong>Personaliza lo que la gente ve en tu perfil público junto a tus publicaciones.</strong> Es más probable que otras personas te sigan e interactúen contigo cuando completas tu perfil y foto."
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d2a4bc605e..88d48fefcb 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1212,8 +1212,6 @@ et:
       your_appeal_approved: Su vaidlustus on heakskiidetud
       your_appeal_pending: Vaidlustus on esitatud
       your_appeal_rejected: Vaidlustus on tagasi lükatud
-  domain_validator:
-    invalid_domain: ei ole sobiv domeeni nimi
   edit_profile:
     basic_information: Põhiinfo
     hint_html: "<strong>Kohanda, mida inimesed näevad su avalikul profiilil ja postituste kõrval.</strong> Inimesed alustavad tõenäolisemalt sinu jälgimist ja interakteeruvad sinuga, kui sul on täidetud profiil ja profiilipilt."
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 5e7d4a7f05..e5ae0ab79d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1155,8 +1155,6 @@ eu:
       your_appeal_approved: Zure apelazioa onartu da
       your_appeal_pending: Apelazio bat bidali duzu
       your_appeal_rejected: Zure apelazioa baztertu da
-  domain_validator:
-    invalid_domain: ez da domeinu izen baliogarria
   edit_profile:
     basic_information: Oinarrizko informazioa
     hint_html: "<strong>Pertsonalizatu jendeak zer ikusi dezakeen zure profil publikoan eta zure bidalketen baitan.</strong> Segur aski, jende gehiagok jarraituko dizu eta interakzio gehiago izango dituzu profila osatuta baduzu, profil irudia eta guzti."
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 42782da204..ce8a61e3f0 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -986,8 +986,6 @@ fa:
       your_appeal_approved: درخواست تجدیدنظرتان پذیرفته شد
       your_appeal_pending: شما یک درخواست تجدیدنظر فرستادید
       your_appeal_rejected: درخواست تجدیدنظرتان رد شد
-  domain_validator:
-    invalid_domain: نام دامین معتبر نیست
   edit_profile:
     basic_information: اطلاعات پایه
     hint_html: "<strong>شخصی‌سازی آن چه مردم روی نمایهٔ عمومیتان و کنار فرسته‌هایتان می‌بینند.</strong> هنگامی که نمایه‌ای کامل و یک تصویر نمایه داشته باشید،‌ احتمال پی‌گیری متقابل و تعامل با شما بیش‌تر است."
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c94f04a9bb..90c1e77760 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1235,8 +1235,6 @@ fi:
       your_appeal_approved: Valituksesi on hyväksytty
       your_appeal_pending: Olet lähettänyt valituksen
       your_appeal_rejected: Valituksesi on hylätty
-  domain_validator:
-    invalid_domain: ei ole kelvollinen verkkotunnus
   edit_profile:
     basic_information: Perustiedot
     hint_html: "<strong>Mukauta, mitä ihmiset näkevät julkisessa profiilissasi ja julkaisujesi vieressä.</strong> Sinua seurataan takaisin ja kanssasi ollaan vuorovaikutuksessa todennäköisemmin, kun sinulla on täytetty profiili ja profiilikuva."
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index f3d9aee4c2..5bc192e9db 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1234,8 +1234,6 @@ fo:
       your_appeal_approved: Kæra tín er góðkend
       your_appeal_pending: Tú hevur kært
       your_appeal_rejected: Kæra tín er vrakað
-  domain_validator:
-    invalid_domain: er ikki eitt loyvt økisnavn
   edit_profile:
     basic_information: Grundleggjandi upplýsingar
     hint_html: "<strong>Tillaga tað, sum fólk síggja á tínum almenna vanga og við síðna av tínum postum.</strong> Sannlíkindini fyri, at onnur fylgja tær og virka saman við tær eru størri, tá tú hevur fylt út vangan og eina vangamynd."
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 766ba71d8a..27e09d1f9c 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1222,8 +1222,6 @@ fr-CA:
       your_appeal_approved: Votre appel a été approuvé
       your_appeal_pending: Vous avez soumis un appel
       your_appeal_rejected: Votre appel a été rejeté
-  domain_validator:
-    invalid_domain: n’est pas un nom de domaine valide
   edit_profile:
     basic_information: Informations de base
     hint_html: "<strong>Personnalisez ce que les gens voient sur votre profil public et à côté de vos messages.</strong> Les autres personnes seront plus susceptibles de vous suivre et d’interagir avec vous lorsque vous avez un profil complet et une photo."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 420a4d314e..055b50900c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1222,8 +1222,6 @@ fr:
       your_appeal_approved: Votre appel a été approuvé
       your_appeal_pending: Vous avez soumis un appel
       your_appeal_rejected: Votre appel a été rejeté
-  domain_validator:
-    invalid_domain: n’est pas un nom de domaine valide
   edit_profile:
     basic_information: Informations de base
     hint_html: "<strong>Personnalisez ce que les gens voient sur votre profil public et à côté de vos messages.</strong> Les autres personnes seront plus susceptibles de vous suivre et d’interagir avec vous lorsque vous avez un profil complet et une photo."
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index de7495dd55..27fcaf3af7 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -1231,8 +1231,6 @@ fy:
       your_appeal_approved: Jo beswier is goedkard
       your_appeal_pending: Jo hawwe in beswier yntsjinne
       your_appeal_rejected: Jo beswier is ôfwêzen
-  domain_validator:
-    invalid_domain: is in ûnjildige domeinnamme
   edit_profile:
     basic_information: Algemiene ynformaasje
     hint_html: "<strong>Pas oan wat minsken op jo iepenbiere profyl en njonken jo berjochten sjogge.</strong> Oare minsken sille jo earder folgje en mei jo kommunisearje wannear’t jo profyl ynfolle is en jo in profylfoto hawwe."
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index d2783a5a6a..870f79cba9 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -1288,8 +1288,6 @@ ga:
       your_appeal_approved: Tá d’achomharc ceadaithe
       your_appeal_pending: Chuir tú achomharc isteach
       your_appeal_rejected: Diúltaíodh do d'achomharc
-  domain_validator:
-    invalid_domain: nach ainm fearainn bailí é
   edit_profile:
     basic_information: Eolas bunúsach
     hint_html: "<strong>Saincheap a bhfeiceann daoine ar do phróifíl phoiblí agus in aice le do phostálacha.</strong> Is dóichí go leanfaidh daoine eile ar ais tú agus go n-idirghníomhóidh siad leat nuair a bhíonn próifíl líonta agus pictiúr próifíle agat."
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index c08ba60213..dda918d15c 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -1270,8 +1270,6 @@ gd:
       your_appeal_approved: Chaidh aontachadh ris an ath-thagradh agad
       your_appeal_pending: Chuir thu ath-thagradh a-null
       your_appeal_rejected: Chaidh an t-ath-thagradh agad a dhiùltadh
-  domain_validator:
-    invalid_domain: "– chan eil seo ’na ainm àrainne dligheach"
   edit_profile:
     basic_information: Fiosrachadh bunasach
     hint_html: "<strong>Gnàthaich na chithear air a’ phròifil phoblach agad is ri taobh nam postaichean agad.</strong> Bidh càch nas buailtiche do leantainn agus conaltradh leat nuair a bhios tu air a’ phròifil agad a lìonadh agus dealbh rithe."
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 657908922d..c8fa1d833d 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1235,8 +1235,6 @@ gl:
       your_appeal_approved: A apelación foi aprobada
       your_appeal_pending: Enviaches unha apelación
       your_appeal_rejected: A apelación foi rexeitada
-  domain_validator:
-    invalid_domain: non é un nome de dominio válido
   edit_profile:
     basic_information: Información básica
     hint_html: "<strong>Personaliza o que van ver no teu perfil público e ao lado das túas publicacións.</strong> As outras persoas estarán máis animadas a seguirte e interactuar contigo se engades algún dato sobre ti así como unha imaxe de perfil."
diff --git a/config/locales/he.yml b/config/locales/he.yml
index a838c69636..025b2de9e2 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1270,8 +1270,6 @@ he:
       your_appeal_approved: ערעורך התקבל
       your_appeal_pending: הגשת ערעור
       your_appeal_rejected: ערעורך נדחה
-  domain_validator:
-    invalid_domain: הוא לא שם דומיין קביל
   edit_profile:
     basic_information: מידע בסיסי
     hint_html: "<strong>התאמה אישית של מה שיראו אחרים בפרופיל הציבורי שלך וליד הודעותיך.</strong> אחרים עשויים יותר להחזיר עוקב וליצור אתך שיחה אם הפרופיל והתמונה יהיו מלאים."
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 71af138305..141f5b7d07 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1234,8 +1234,6 @@ hu:
       your_appeal_approved: A fellebbezésedet jóváhagyták
       your_appeal_pending: Beküldtél egy fellebbezést
       your_appeal_rejected: A fellebbezésedet visszautasították
-  domain_validator:
-    invalid_domain: nem egy valódi domain név
   edit_profile:
     basic_information: Általános információk
     hint_html: "<strong>Tedd egyedivé, mi látnak mások a profilodon és a bejegyzéseid mellett.</strong> Mások nagyobb eséllyel követnek vissza és lépnek veled kapcsolatba, ha van kitöltött profilod és profilképed."
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index dfb280ac48..c7128a2a46 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -523,8 +523,6 @@ hy:
     success_msg: Հաշիւդ բարեյաջող ջնջուեց
     warning:
       username_available: Քո օգտանունը կրկին հասանելի կը դառնայ
-  domain_validator:
-    invalid_domain: անվաւէր տիրոյթի անուն
   errors:
     '404': Էջը, որը փնտրում ես գոյութիւն չունի։
     '429': Չափազանց շատ հարցումներ
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8827e084d2..073e5032b4 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1220,8 +1220,6 @@ ia:
       your_appeal_approved: Tu appello ha essite approbate
       your_appeal_pending: Tu ha submittite un appello
       your_appeal_rejected: Tu appello ha essite rejectate
-  domain_validator:
-    invalid_domain: non es un nomine de dominio valide
   edit_profile:
     basic_information: Information basic
     hint_html: "<strong>Personalisa lo que le personas vide sur tu profilo public e presso tu messages.</strong> Il es plus probabile que altere personas te seque e interage con te quando tu ha un profilo complete e un photo."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 73b4218397..575daddca6 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1000,8 +1000,6 @@ id:
       your_appeal_approved: Banding Anda disetujui
       your_appeal_pending: Anda telah mengirim banding
       your_appeal_rejected: Banding Anda ditolak
-  domain_validator:
-    invalid_domain: bukan nama domain yang valid
   errors:
     '400': Permintaan yang dikirim tidak valid atau cacat.
     '403': Anda tidak mempunyai izin untuk melihat halaman ini.
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 4ee869d92f..1529ea04b8 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1153,8 +1153,6 @@ ie:
       your_appeal_approved: Tui apelle ha esset aprobat
       your_appeal_pending: Tu ha fat un apelle
       your_appeal_rejected: Tui apelle ha esset rejectet
-  domain_validator:
-    invalid_domain: ne es un valid dominia-nómine
   edit_profile:
     basic_information: Basic information
     hint_html: "<strong>Customisa ti quel gente vide sur tui public profil e apu tui postas.</strong> Altri persones es plu probabil sequer te e interacter con te si tu have un detalliat profil e un profil-image."
diff --git a/config/locales/io.yml b/config/locales/io.yml
index a1d268b9fa..d1b9aef3e5 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1128,8 +1128,6 @@ io:
       your_appeal_approved: Vua konto aprobesis
       your_appeal_pending: Vu sendis apelo
       your_appeal_rejected: Vua apelo refuzesis
-  domain_validator:
-    invalid_domain: ne esas valida domennomo
   edit_profile:
     basic_information: Fundamentala informo
     other: Altra
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 748d931ff8..1c84c45c80 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -1238,8 +1238,6 @@ is:
       your_appeal_approved: Áfrýjun þín hefur verið samþykkt
       your_appeal_pending: Þú hefur sent inn áfrýjun
       your_appeal_rejected: Áfrýjun þinni hefur verið hafnað
-  domain_validator:
-    invalid_domain: er ekki leyfilegt nafn á léni
   edit_profile:
     basic_information: Grunnupplýsingar
     hint_html: "<strong>Sérsníddu hvað fólk sér á opinbera notandasniðinu þínu og næst færslunum þínum.</strong> Annað fólk er líklegra til að fylgjast með þér og eiga í samskiptum við þig ef þú fyllir út notandasniðið og setur auðkennismynd."
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a1ed71a7a0..a429c6339b 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1237,8 +1237,6 @@ it:
       your_appeal_approved: Il tuo appello è stato approvato
       your_appeal_pending: Hai presentato un appello
       your_appeal_rejected: Il tuo appello è stato respinto
-  domain_validator:
-    invalid_domain: non è un nome di dominio valido
   edit_profile:
     basic_information: Informazioni di base
     hint_html: "<strong>Personalizza ciò che le persone vedono sul tuo profilo pubblico e accanto ai tuoi post.</strong> È più probabile che altre persone ti seguano e interagiscano con te quando hai un profilo compilato e un'immagine del profilo."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index af9173cfc4..3f50b0d7a6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1213,8 +1213,6 @@ ja:
       your_appeal_approved: 申し立てが承認されました
       your_appeal_pending: 申し立てを送信しました
       your_appeal_rejected: 申し立ては拒否されました
-  domain_validator:
-    invalid_domain: は無効なドメイン名です
   edit_profile:
     basic_information: 基本情報
     hint_html: "<strong>アカウントのトップページや投稿の隣に表示される公開情報です。</strong>プロフィールとアイコンを設定することで、ほかのユーザーは親しみやすく、またフォローしやすくなります。"
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index 065cd801f7..f89bdee622 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -385,8 +385,6 @@ kk:
       more_details_html: Қосымша мәліметтер алу үшін <a href="%{terms_path}"> құпиялылық саясатын </a> қараңыз.
       username_available: Аккаунтыңыз қайтадан қолжетімді болады
       username_unavailable: Логиніңіз қолжетімді болмайды
-  domain_validator:
-    invalid_domain: жарамды домен атауы емес
   errors:
     '400': Сіз жіберген сұрау жарамсыз немесе дұрыс емес.
     '403': Бұны көру үшін сізде рұқсат жоқ.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 962ecdd053..ab377df304 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1218,8 +1218,6 @@ ko:
       your_appeal_approved: 소명이 받아들여졌습니다
       your_appeal_pending: 소명을 제출했습니다
       your_appeal_rejected: 소명이 기각되었습니다
-  domain_validator:
-    invalid_domain: 올바른 도메인 네임이 아닙니다
   edit_profile:
     basic_information: 기본 정보
     hint_html: "<strong>사람들이 공개 프로필을 보고서 게시물을 볼 때를 위한 프로필을 꾸밉니다.</strong> 프로필과 프로필 사진을 채우면 다른 사람들이 나를 팔로우하고 나와 교류할 기회가 더 많아집니다."
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index cbb6b76406..20fe6cf6de 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1014,8 +1014,6 @@ ku:
       your_appeal_approved: Îtîraza te hate pejirandin
       your_appeal_pending: Te îtîrazek şand
       your_appeal_rejected: Îtîraza te nehate pejirandin
-  domain_validator:
-    invalid_domain: ne naveke navper a derbasdar e
   errors:
     '400': Daxwaza ku te şand nederbasdar an çewt bû.
     '403': Ji bo dîtina vê rûpelê mafê te nîn e.
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 5d60e6e9a1..164967159b 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -1186,8 +1186,6 @@ lad:
       your_appeal_approved: Tu apelasyon fue achetada
       your_appeal_pending: Tienes enviado una apelasyon
       your_appeal_rejected: Tu apelasyon fue refuzada
-  domain_validator:
-    invalid_domain: no es un nombre de domeno valido
   edit_profile:
     basic_information: Enformasyon bazika
     hint_html: "<strong>Personaliza lo ke la djente ve en tu profil publiko i kon tus publikasyones.</strong> Es mas probavle ke otras personas te sigan i enteraktuen kontigo kuando kompletas tu profil i foto."
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 43b6995e28..5dd6ff9e1e 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1162,8 +1162,6 @@ lv:
       your_appeal_approved: Jūsu apelācija ir apstiprināta
       your_appeal_pending: Jūs esat iesniedzis apelāciju
       your_appeal_rejected: Jūsu apelācija ir noraidīta
-  domain_validator:
-    invalid_domain: nav derīgs domēna nosaukums
   edit_profile:
     basic_information: Pamata informācija
     hint_html: "<strong>Pielāgo, ko cilvēki redz Tavā publiskajā profilā un blakus Taviem ierakstiem.</strong> Ir lielāka iespējamība, ka citi clivēki sekos Tev un mijiedarbosies ar Tevi, ja Tev ir aizpildīts profils un profila attēls."
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 28a2993d36..c91a624230 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1115,8 +1115,6 @@ ms:
       your_appeal_approved: Rayuan anda telah diluluskan
       your_appeal_pending: Anda telah menghantar rayuan
       your_appeal_rejected: Rayuan anda telah ditolak
-  domain_validator:
-    invalid_domain: bukan nama domain yang sah
   edit_profile:
     basic_information: Maklumat Asas
     hint_html: "<strong>Sesuaikan perkara yang orang lihat pada profil awam anda dan di sebelah siaran anda.</strong> Orang lain lebih berkemungkinan mengikuti anda kembali dan berinteraksi dengan anda apabila anda mempunyai profil dan gambar profil yang telah diisi."
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 76372ba174..771fbba579 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1108,8 +1108,6 @@ my:
       your_appeal_approved: သင့်တင်သွင်းခြင်းကို အတည်ပြုပြီးပါပြီ
       your_appeal_pending: အယူခံဝင်ရန် တင်သွင်းထားသည်
       your_appeal_rejected: အယူခံဝင်မှုကို ပယ်ချလိုက်သည်
-  domain_validator:
-    invalid_domain: တရားဝင်ဒိုမိန်းအမည်မဟုတ်ပါ
   edit_profile:
     basic_information: အခြေခံသတင်းအချက်အလက်
     hint_html: "<strong>သင်၏ အများမြင်ပရိုဖိုင်နှင့် သင့်ပို့စ်များဘေးရှိ တွေ့မြင်ရသည့်အရာကို စိတ်ကြိုက်ပြင်ဆင်ပါ။ </strong> သင့်တွင် ပရိုဖိုင်နှင့် ပရိုဖိုင်ပုံတစ်ခု ဖြည့်သွင်းထားပါက အခြားသူများအနေဖြင့် သင်နှင့် အပြန်အလှန် တုံ့ပြန်နိုင်ခြေပိုများပါသည်။"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 725d3915c2..c74bf488b5 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1235,8 +1235,6 @@ nl:
       your_appeal_approved: Jouw bezwaar is goedgekeurd
       your_appeal_pending: Je hebt een bezwaar ingediend
       your_appeal_rejected: Jouw bezwaar is afgewezen
-  domain_validator:
-    invalid_domain: is een ongeldige domeinnaam
   edit_profile:
     basic_information: Algemene informatie
     hint_html: "<strong>Wat mensen op jouw openbare profiel en naast je berichten zien aanpassen.</strong> Andere mensen gaan je waarschijnlijk eerder volgen en hebben vaker interactie met je, wanneer je profiel is ingevuld en je een profielfoto hebt."
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index f7c2f74260..5c46a0d43e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -1232,8 +1232,6 @@ nn:
       your_appeal_approved: Din klage har blitt godkjent
       your_appeal_pending: Du har levert en klage
       your_appeal_rejected: Din klage har blitt avvist
-  domain_validator:
-    invalid_domain: er ikkje eit gangbart domenenamn
   edit_profile:
     basic_information: Grunnleggande informasjon
     hint_html: "<strong>Tilpass kva folk ser på den offentlege profilen din og ved sida av innlegga dine.</strong> Andre vil i større grad fylgja og samhandla med deg når du har eit profilbilete og har fyllt ut profilen din."
diff --git a/config/locales/no.yml b/config/locales/no.yml
index e2ede9328b..b3eebd8ecc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1147,8 +1147,6 @@
       your_appeal_approved: Anken din har blitt godkjent
       your_appeal_pending: Du har levert en anke
       your_appeal_rejected: Anken din har blitt avvist
-  domain_validator:
-    invalid_domain: er ikke et gyldig domenenavn
   edit_profile:
     basic_information: Grunnleggende informasjon
     hint_html: "<strong>Tilpass hva folk ser på din offentlige profil og ved siden av dine innlegg.</strong> Det er mer sannsynlig at andre mennesker følger deg tilbake og samhandler med deg når du har fylt ut en profil og et profilbilde."
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 8373513c9b..e88f8a3f69 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -538,8 +538,6 @@ oc:
     strikes:
       title_actions:
         none: Avertiment
-  domain_validator:
-    invalid_domain: es pas un nom de domeni valid
   errors:
     '403': Avètz pas l’autorizacion de veire aquesta pagina.
     '404': La pagina que cercatz existís pas aquí.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7a8d208b06..c90d448a7f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1270,8 +1270,6 @@ pl:
       your_appeal_approved: Twoje odwołanie zostało zatwierdzone
       your_appeal_pending: Zgłosiłeś odwołanie
       your_appeal_rejected: Twoje odwołanie zostało odrzucone
-  domain_validator:
-    invalid_domain: nie jest prawidłową nazwą domeny
   edit_profile:
     basic_information: Podstawowe informacje
     hint_html: "<strong>Dostosuj to, co ludzie widzą na Twoim profilu publicznym i obok Twoich wpisów.</strong> Inne osoby są bardziej skłonne obserwować Cię i wchodzić z Tobą w interakcje, gdy masz wypełniony profil i zdjęcie profilowe."
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 18496b9e1d..3c14589e6c 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1231,8 +1231,6 @@ pt-BR:
       your_appeal_approved: Sua revisão foi aprovada
       your_appeal_pending: Você enviou uma revisão
       your_appeal_rejected: Sua revisão foi rejeitada
-  domain_validator:
-    invalid_domain: não é um nome de domínio válido
   edit_profile:
     basic_information: Informações básicas
     hint_html: "<strong>Personalize o que as pessoas veem no seu perfil público e ao lado de suas publicações.</strong> É mais provável que outras pessoas o sigam de volta e interajam com você quando você tiver um perfil preenchido e uma foto de perfil."
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 96cb92efda..0f0d6f36ee 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -1199,8 +1199,6 @@ pt-PT:
       your_appeal_approved: O seu recurso foi deferido
       your_appeal_pending: Submeteu um recurso
       your_appeal_rejected: O seu recurso foi indeferido
-  domain_validator:
-    invalid_domain: não é um nome de domínio válido
   edit_profile:
     basic_information: Informação básica
     hint_html: "<strong>Personalize o que as pessoas veem no seu perfil público e junto das suas publicações.</strong> É mais provável que as outras pessoas o sigam de volta ou interajam consigo se tiver um perfil preenchido e uma imagem de perfil."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b9c582843d..9d6b2946ac 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1193,8 +1193,6 @@ ru:
       your_appeal_approved: Ваша апелляция одобрена
       your_appeal_pending: Вы подали апелляцию
       your_appeal_rejected: Ваша апелляция отклонена
-  domain_validator:
-    invalid_domain: не является корректным доменным именем
   edit_profile:
     basic_information: Основная информация
     hint_html: "<strong>Настройте то, что люди видят в вашем публичном профиле и рядом с вашими сообщениями.</strong> Другие люди с большей вероятностью подпишутся на Вас и будут взаимодействовать с вами, если у Вас заполнен профиль и добавлено изображение."
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index ee66cef834..fee79a1325 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -734,8 +734,6 @@ sc:
       title_actions:
         delete_statuses: Cantzelladura de publicatziones
         none: Atentzione
-  domain_validator:
-    invalid_domain: no est unu nòmine de domìniu vàlidu
   edit_profile:
     basic_information: Informatzione bàsica
     other: Àteru
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 4b7b9e56d7..967706f03a 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1004,8 +1004,6 @@ sco:
       your_appeal_approved: Yer appeal haes been approved
       your_appeal_pending: Ye hae submittit a appeal
       your_appeal_rejected: Yer appeal haes been rejectit
-  domain_validator:
-    invalid_domain: isnae a valid domain nemm
   errors:
     '400': The request thit ye submittit wisnae valid or it wis illformt.
     '403': Ye dinnae hae permission fir tae luik at this page.
diff --git a/config/locales/si.yml b/config/locales/si.yml
index e68da4321a..c7968e2479 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -892,8 +892,6 @@ si:
       your_appeal_approved: ඔබගේ අභියාචනය අනුමත කර ඇත
       your_appeal_pending: ඔබ අභියාචනයක් ඉදිරිපත් කර ඇත
       your_appeal_rejected: ඔබගේ අභියාචනය ප්‍රතික්ෂේප කර ඇත
-  domain_validator:
-    invalid_domain: වලංගු ඩොමේන් නාමයක් නොවේ
   edit_profile:
     basic_information: මූලික තොරතුරු
     other: වෙනත්
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index c1fae7e83e..8f6137c8c1 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -3,6 +3,7 @@ en:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protects from false attributions.
         discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
         display_name: Your full name or your fun name.
         fields: Your homepage, pronouns, age, anything you want.
@@ -143,6 +144,7 @@ en:
         url: Where events will be sent to
     labels:
       account:
+        attribution_domains_as_text: Only allow specific websites
         discoverable: Feature profile and posts in discovery algorithms
         fields:
           name: Label
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index ad9f8fb5ee..c49da0fc38 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -905,8 +905,6 @@ sk:
         silence: Obmedzenie účtu
       your_appeal_approved: Tvoja námietka bola schválená
       your_appeal_pending: Odoslal si námietku
-  domain_validator:
-    invalid_domain: nieje správny tvar domény
   edit_profile:
     basic_information: Základné informácie
     other: Ostatné
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 3384049a11..d0440abb00 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1263,8 +1263,6 @@ sl:
       your_appeal_approved: Vaša pritožba je bila odobrena
       your_appeal_pending: Oddali ste pritožbo
       your_appeal_rejected: Vaša pritožba je bila zavržena
-  domain_validator:
-    invalid_domain: ni veljavno ime domene
   edit_profile:
     basic_information: Osnovni podatki
     hint_html: "<strong>Prilagodite, kaj ljudje vidijo na vašem javnem profilu in poleg vaših objav.</strong> Drugi vam bodo raje sledili nazaj in z vami klepetali, če boste imeli izpolnjen profil in nastavljeno profilno sliko."
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 6907c1ee3c..5e8a3c912c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1226,8 +1226,6 @@ sq:
       your_appeal_approved: Apelimi juaj u miratua
       your_appeal_pending: Keni parashtruar një apelim
       your_appeal_rejected: Apelimi juaj është hedhur poshtë
-  domain_validator:
-    invalid_domain: s’është emër i vlefshëm përkatësie
   edit_profile:
     basic_information: Hollësi elementare
     hint_html: "<strong>Përshtatni ç’shohin njerëzit në profilin tuaj publik dhe në krah të postimeve tuaja.</strong> Personat e tjerë ka më shumë gjasa t’ju ndjekin dhe ndërveprojnë me ju, kur keni të plotësuar profilin dhe një foto profili."
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index dfc8a635c8..428b9cb084 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1174,8 +1174,6 @@ sr-Latn:
       your_appeal_approved: Vaša žalba je uvažena
       your_appeal_pending: Priložili ste žalbu
       your_appeal_rejected: Vaša žalba je odbijena
-  domain_validator:
-    invalid_domain: nelegitimno ime domena
   edit_profile:
     basic_information: Osnovne informacije
     hint_html: "<strong>Prilagodite šta ljudi vide na vašem javnom profilu i pored vaših objava.</strong> Veća je verovatnoća da će vas drugi pratiti i komunicirati sa vama kada imate popunjen profil i sliku profila."
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2bbc4ef131..08fbf39fb8 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1204,8 +1204,6 @@ sr:
       your_appeal_approved: Ваша жалба је уважена
       your_appeal_pending: Приложили сте жалбу
       your_appeal_rejected: Ваша жалба је одбијена
-  domain_validator:
-    invalid_domain: нелегитимно име домена
   edit_profile:
     basic_information: Основне информације
     hint_html: "<strong>Прилагодите шта људи виде на вашем јавном профилу и поред ваших објава.</strong> Већа је вероватноћа да ће вас други пратити и комуницирати са вама када имате попуњен профил и слику профила."
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index df403e602a..0cc47ca92e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1182,8 +1182,6 @@ sv:
       your_appeal_approved: Din överklagan har godkänts
       your_appeal_pending: Du har lämnat in en överklagan
       your_appeal_rejected: Din överklagan har avvisats
-  domain_validator:
-    invalid_domain: är inte ett giltigt domännamn
   edit_profile:
     basic_information: Allmän information
     hint_html: "<strong>Anpassa vad folk ser på din offentliga profil och bredvid dina inlägg.</strong> Andra personer är mer benägna att följa dig och interagera med dig när du har en ifylld profil och en profilbild."
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f409a512d9..d1de9fd818 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1216,8 +1216,6 @@ th:
       your_appeal_approved: อนุมัติการอุทธรณ์ของคุณแล้ว
       your_appeal_pending: คุณได้ส่งการอุทธรณ์
       your_appeal_rejected: ปฏิเสธการอุทธรณ์ของคุณแล้ว
-  domain_validator:
-    invalid_domain: ไม่ใช่ชื่อโดเมนที่ถูกต้อง
   edit_profile:
     basic_information: ข้อมูลพื้นฐาน
     hint_html: "<strong>ปรับแต่งสิ่งที่ผู้คนเห็นในโปรไฟล์สาธารณะของคุณและถัดจากโพสต์ของคุณ</strong> ผู้คนอื่น ๆ มีแนวโน้มที่จะติดตามคุณกลับและโต้ตอบกับคุณมากขึ้นเมื่อคุณมีโปรไฟล์ที่กรอกแล้วและรูปภาพโปรไฟล์"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index d2d499077d..d8f5eff6e8 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1235,8 +1235,6 @@ tr:
       your_appeal_approved: İtirazınız onaylandı
       your_appeal_pending: Bir itiraz gönderdiniz
       your_appeal_rejected: İtirazınız reddedildi
-  domain_validator:
-    invalid_domain: geçerli bir alan adı değil
   edit_profile:
     basic_information: Temel bilgiler
     hint_html: "<strong>İnsanlara herkese açık profilinizde ve gönderilerinizin yanında ne göstermek istediğinizi düzenleyin.</strong> Dolu bir profile ve bir profil resmine sahip olduğunuzda diğer insanlar daha yüksek ihtimalle sizi takip etmek ve sizinle etkileşime geçmek isteyeceklerdir."
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 4e70b192d9..600239107e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1270,8 +1270,6 @@ uk:
       your_appeal_approved: Вашу апеляцію було схвалено
       your_appeal_pending: Ви не подавали апеляцій
       your_appeal_rejected: Вашу апеляцію було відхилено
-  domain_validator:
-    invalid_domain: не є допустимим ім'ям домену
   edit_profile:
     basic_information: Основна інформація
     hint_html: "<strong>Налаштуйте те, що люди бачитимуть у вашому загальнодоступному профілі та поруч із вашими дописами.</strong> Інші люди з більшою ймовірністю підпишуться на вас та взаємодіятимуть з вами, якщо у вас є заповнений профіль та зображення профілю."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d211b9e740..dfb36c02da 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1216,8 +1216,6 @@ vi:
       your_appeal_approved: Khiếu nại của bạn được chấp nhận
       your_appeal_pending: Bạn đã gửi một khiếu nại
       your_appeal_rejected: Khiếu nại của bạn bị từ chối
-  domain_validator:
-    invalid_domain: không phải là một tên miền hợp lệ
   edit_profile:
     basic_information: Thông tin cơ bản
     hint_html: "<strong>Tùy chỉnh những gì mọi người nhìn thấy trên hồ sơ công khai và bên cạnh tút của bạn.</strong> Mọi người sẽ muốn theo dõi và tương tác với bạn hơn nếu bạn có ảnh đại diện và một hồ sơ hoàn chỉnh."
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7407d81db9..b97ab65f04 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1217,8 +1217,6 @@ zh-CN:
       your_appeal_approved: 你的申诉已被批准
       your_appeal_pending: 你已提交申诉
       your_appeal_rejected: 你的申诉已被驳回
-  domain_validator:
-    invalid_domain: 不是一个有效的域名
   edit_profile:
     basic_information: 基本信息
     hint_html: "<strong>自定义公开资料和嘟文旁边显示的内容。</strong>当您填写完整的个人资料并设置了头像时，其他人更有可能关注您并与您互动。"
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 26743d2cb1..90227b911d 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1135,8 +1135,6 @@ zh-HK:
       your_appeal_approved: 你的申訴已獲批准
       your_appeal_pending: 你已提交申訴
       your_appeal_rejected: 你的申訴已被駁回
-  domain_validator:
-    invalid_domain: 不是一個可用域名
   edit_profile:
     basic_information: 基本資料
     hint_html: "<strong>自訂你的公開個人檔案和帖文內容。</strong>當你有完整的個人檔案和頭像時，其他人更願意追蹤你和與你互動。"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d92d53f391..052773e328 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1219,8 +1219,6 @@ zh-TW:
       your_appeal_approved: 您的申訴已被批准
       your_appeal_pending: 您已遞交申訴
       your_appeal_rejected: 您的申訴已被駁回
-  domain_validator:
-    invalid_domain: 並非一個有效網域
   edit_profile:
     basic_information: 基本資訊
     hint_html: "<strong>自訂人們能於您個人檔案及嘟文旁所見之內容。</strong>當您完成填寫個人檔案及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index 297b80942c..cefa24316d 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -60,7 +60,7 @@ namespace :settings do
 
   resource :delete, only: [:show, :destroy]
   resource :migration, only: [:show, :create]
-  resource :verification, only: :show
+  resource :verification, only: [:show, :update]
   resource :privacy, only: [:show, :update], controller: 'privacy'
 
   namespace :migration do
diff --git a/db/migrate/20240909014637_add_attribution_domains_to_accounts.rb b/db/migrate/20240909014637_add_attribution_domains_to_accounts.rb
new file mode 100644
index 0000000000..e90f6f1ede
--- /dev/null
+++ b/db/migrate/20240909014637_add_attribution_domains_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAttributionDomainsToAccounts < ActiveRecord::Migration[7.1]
+  def change
+    add_column :accounts, :attribution_domains, :string, array: true, default: []
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f01e11792d..540a971333 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_08_08_125420) do
+ActiveRecord::Schema[7.1].define(version: 2024_09_09_014637) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -200,6 +200,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_08_08_125420) do
     t.datetime "reviewed_at", precision: nil
     t.datetime "requested_review_at", precision: nil
     t.boolean "indexable", default: false, null: false
+    t.string "attribution_domains", default: [], array: true
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), COALESCE(lower((domain)::text), ''::text)", name: "index_accounts_on_username_and_domain_lower", unique: true
     t.index ["domain", "id"], name: "index_accounts_on_domain_and_id"
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index 93c5de0899..67d5ab54f0 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -95,6 +95,7 @@ RSpec.describe Settings::MigrationsController do
 
         before do
           moved_to = Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(user.account)])
+          p moved_to.acct
           user.account.migrations.create!(acct: moved_to.acct)
         end
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 1e8e4b1e4d..2ec7aafc51 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -747,6 +747,22 @@ RSpec.describe Account do
     end
   end
 
+  describe '#can_be_attributed_from?' do
+    subject { Fabricate(:account, attribution_domains: %w(example.com)) }
+
+    it 'returns true for a matching domain' do
+      expect(subject.can_be_attributed_from?('example.com')).to be true
+    end
+
+    it 'returns true for a subdomain of a domain' do
+      expect(subject.can_be_attributed_from?('foo.example.com')).to be true
+    end
+
+    it 'returns false for a non-matching domain' do
+      expect(subject.can_be_attributed_from?('hoge.com')).to be false
+    end
+  end
+
   describe 'Normalizations' do
     describe 'username' do
       it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') }
diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb
index 86314e6b48..e4a36cf182 100644
--- a/spec/services/activitypub/process_account_service_spec.rb
+++ b/spec/services/activitypub/process_account_service_spec.rb
@@ -63,6 +63,26 @@ RSpec.describe ActivityPub::ProcessAccountService do
     end
   end
 
+  context 'with attribution domains' do
+    let(:payload) do
+      {
+        id: 'https://foo.test',
+        type: 'Actor',
+        inbox: 'https://foo.test/inbox',
+        attributionDomains: [
+          'example.com',
+        ],
+      }.with_indifferent_access
+    end
+
+    it 'parses attribution domains' do
+      account = subject.call('alice', 'example.com', payload)
+
+      expect(account.attribution_domains)
+        .to match_array(%w(example.com))
+    end
+  end
+
   context 'when account is not suspended' do
     subject { described_class.new.call(account.username, account.domain, payload) }
 
diff --git a/spec/services/bulk_import_service_spec.rb b/spec/services/bulk_import_service_spec.rb
index e8bec96c85..0197f81a44 100644
--- a/spec/services/bulk_import_service_spec.rb
+++ b/spec/services/bulk_import_service_spec.rb
@@ -274,7 +274,7 @@ RSpec.describe BulkImportService do
       let(:rows) do
         [
           { 'domain' => 'blocked.com' },
-          { 'domain' => 'to_block.com' },
+          { 'domain' => 'to-block.com' },
         ]
       end
 
@@ -286,7 +286,7 @@ RSpec.describe BulkImportService do
 
       it 'blocks all the new domains' do
         subject.call(import)
-        expect(account.domain_blocks.pluck(:domain)).to contain_exactly('alreadyblocked.com', 'blocked.com', 'to_block.com')
+        expect(account.domain_blocks.pluck(:domain)).to contain_exactly('alreadyblocked.com', 'blocked.com', 'to-block.com')
       end
 
       it 'marks the import as finished' do
@@ -302,7 +302,7 @@ RSpec.describe BulkImportService do
       let(:rows) do
         [
           { 'domain' => 'blocked.com' },
-          { 'domain' => 'to_block.com' },
+          { 'domain' => 'to-block.com' },
         ]
       end
 
@@ -314,7 +314,7 @@ RSpec.describe BulkImportService do
 
       it 'blocks all the new domains' do
         subject.call(import)
-        expect(account.domain_blocks.pluck(:domain)).to contain_exactly('blocked.com', 'to_block.com')
+        expect(account.domain_blocks.pluck(:domain)).to contain_exactly('blocked.com', 'to-block.com')
       end
 
       it 'marks the import as finished' do
diff --git a/spec/validators/domain_validator_spec.rb b/spec/validators/domain_validator_spec.rb
new file mode 100644
index 0000000000..0b4cb0d3f0
--- /dev/null
+++ b/spec/validators/domain_validator_spec.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DomainValidator do
+  let(:record) { record_class.new }
+
+  context 'with no options' do
+    let(:record_class) do
+      Class.new do
+        include ActiveModel::Validations
+
+        attr_accessor :domain
+
+        validates :domain, domain: true
+      end
+    end
+
+    describe '#validate_each' do
+      context 'with a nil value' do
+        it 'does not add errors' do
+          record.domain = nil
+
+          expect(record).to be_valid
+          expect(record.errors).to be_empty
+        end
+      end
+
+      context 'with a valid domain' do
+        it 'does not add errors' do
+          record.domain = 'example.com'
+
+          expect(record).to be_valid
+          expect(record.errors).to be_empty
+        end
+      end
+
+      context 'with a domain that is too long' do
+        it 'adds an error' do
+          record.domain = "#{'a' * 300}.com"
+
+          expect(record).to_not be_valid
+          expect(record.errors.where(:domain)).to_not be_empty
+        end
+      end
+
+      context 'with a domain with an empty segment' do
+        it 'adds an error' do
+          record.domain = '.example.com'
+
+          expect(record).to_not be_valid
+          expect(record.errors.where(:domain)).to_not be_empty
+        end
+      end
+
+      context 'with a domain with an invalid character' do
+        it 'adds an error' do
+          record.domain = '*.example.com'
+
+          expect(record).to_not be_valid
+          expect(record.errors.where(:domain)).to_not be_empty
+        end
+      end
+
+      context 'with a domain that would fail parsing' do
+        it 'adds an error' do
+          record.domain = '/'
+
+          expect(record).to_not be_valid
+          expect(record.errors.where(:domain)).to_not be_empty
+        end
+      end
+    end
+  end
+
+  context 'with acct option' do
+    let(:record_class) do
+      Class.new do
+        include ActiveModel::Validations
+
+        attr_accessor :acct
+
+        validates :acct, domain: { acct: true }
+      end
+    end
+
+    describe '#validate_each' do
+      context 'with a nil value' do
+        it 'does not add errors' do
+          record.acct = nil
+
+          expect(record).to be_valid
+          expect(record.errors).to be_empty
+        end
+      end
+
+      context 'with no domain' do
+        it 'does not add errors' do
+          record.acct = 'hoge_123'
+
+          expect(record).to be_valid
+          expect(record.errors).to be_empty
+        end
+      end
+
+      context 'with a valid domain' do
+        it 'does not add errors' do
+          record.acct = 'hoge_123@example.com'
+
+          expect(record).to be_valid
+          expect(record.errors).to be_empty
+        end
+      end
+
+      context 'with an invalid domain' do
+        it 'adds an error' do
+          record.acct = 'hoge_123@.example.com'
+
+          expect(record).to_not be_valid
+          expect(record.errors.where(:acct)).to_not be_empty
+        end
+      end
+    end
+  end
+end
diff --git a/spec/validators/lines_validator_spec.rb b/spec/validators/lines_validator_spec.rb
new file mode 100644
index 0000000000..a80dbbaf3e
--- /dev/null
+++ b/spec/validators/lines_validator_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe LinesValidator do
+  let(:record_class) do
+    Class.new do
+      include ActiveModel::Validations
+
+      attr_accessor :text
+
+      validates :text, lines: { maximum: 5 }
+    end
+  end
+
+  let(:record) { record_class.new }
+
+  describe '#validate_each' do
+    context 'with a nil value' do
+      it 'does not add errors' do
+        record.text = nil
+
+        expect(record).to be_valid
+        expect(record.errors).to be_empty
+      end
+    end
+
+    context 'with lines below the limit' do
+      it 'does not add errors' do
+        record.text = "hoge\n" * 5
+
+        expect(record).to be_valid
+        expect(record.errors).to be_empty
+      end
+    end
+
+    context 'with more lines than limit' do
+      it 'adds an error' do
+        record.text = "hoge\n" * 6
+
+        expect(record).to_not be_valid
+        expect(record.errors.where(:text)).to_not be_empty
+      end
+    end
+  end
+end

From da07adfe6c2137b07f3def1716b370329a9ec9cb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 10 Sep 2024 09:21:40 -0400
Subject: [PATCH 09/89] Add `CustomEmoji.enabled` scope (#31830)

---
 app/lib/entity_cache.rb             | 2 +-
 app/models/announcement_reaction.rb | 2 +-
 app/models/custom_emoji.rb          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 80b0046eea..e647dcab7f 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -27,7 +27,7 @@ class EntityCache
     end
 
     unless uncached_ids.empty?
-      uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).index_by(&:shortcode)
+      uncached = CustomEmoji.enabled.where(shortcode: shortcodes, domain: domain).index_by(&:shortcode)
       uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end
 
diff --git a/app/models/announcement_reaction.rb b/app/models/announcement_reaction.rb
index 9881892c4b..f953402b7e 100644
--- a/app/models/announcement_reaction.rb
+++ b/app/models/announcement_reaction.rb
@@ -27,7 +27,7 @@ class AnnouncementReaction < ApplicationRecord
   private
 
   def set_custom_emoji
-    self.custom_emoji = CustomEmoji.local.find_by(disabled: false, shortcode: name) if name.present?
+    self.custom_emoji = CustomEmoji.local.enabled.find_by(shortcode: name) if name.present?
   end
 
   def queue_publish
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 31ba91ad02..6e788c0c1c 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -48,9 +48,10 @@ class CustomEmoji < ApplicationRecord
 
   scope :local, -> { where(domain: nil) }
   scope :remote, -> { where.not(domain: nil) }
+  scope :enabled, -> { where(disabled: false) }
   scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches("%.#{domain}"))) }
-  scope :listed, -> { local.where(disabled: false).where(visible_in_picker: true) }
+  scope :listed, -> { local.enabled.where(visible_in_picker: true) }
 
   remotable_attachment :image, LIMIT
 

From c4b09d684e864d58fc5eaa171fafcc942e4d6937 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 10 Sep 2024 09:23:55 -0400
Subject: [PATCH 10/89] Extract method for account-referencing in CLI prune
 task (#31824)

---
 lib/mastodon/cli/accounts.rb | 37 +++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 8a138323d4..08a28e5f5c 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -502,17 +502,7 @@ module Mastodon::CLI
       - not muted/blocked by us
     LONG_DESC
     def prune
-      query = Account.remote.non_automated
-      query = query.where('NOT EXISTS (SELECT 1 FROM mentions WHERE account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM favourites WHERE account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM statuses WHERE account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM follows WHERE account_id = accounts.id OR target_account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM blocks WHERE account_id = accounts.id OR target_account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM mutes WHERE target_account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM reports WHERE target_account_id = accounts.id)')
-      query = query.where('NOT EXISTS (SELECT 1 FROM follow_requests WHERE account_id = accounts.id OR target_account_id = accounts.id)')
-
-      _, deleted = parallelize_with_progress(query) do |account|
+      _, deleted = parallelize_with_progress(prunable_accounts) do |account|
         next if account.bot? || account.group?
         next if account.suspended?
         next if account.silenced?
@@ -577,6 +567,31 @@ module Mastodon::CLI
 
     private
 
+    def prunable_accounts
+      Account
+        .remote
+        .non_automated
+        .where.not(referencing_account(Mention, :account_id))
+        .where.not(referencing_account(Favourite, :account_id))
+        .where.not(referencing_account(Status, :account_id))
+        .where.not(referencing_account(Follow, :account_id))
+        .where.not(referencing_account(Follow, :target_account_id))
+        .where.not(referencing_account(Block, :account_id))
+        .where.not(referencing_account(Block, :target_account_id))
+        .where.not(referencing_account(Mute, :target_account_id))
+        .where.not(referencing_account(Report, :target_account_id))
+        .where.not(referencing_account(FollowRequest, :account_id))
+        .where.not(referencing_account(FollowRequest, :target_account_id))
+    end
+
+    def referencing_account(model, attribute)
+      model
+        .where(model.arel_table[attribute].eq Account.arel_table[:id])
+        .select(1)
+        .arel
+        .exists
+    end
+
     def report_errors(errors)
       message = errors.map do |error|
         <<~STRING

From 4ffaced8bcbcb9227722c8e09756c7ca1909aa86 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 10 Sep 2024 16:00:23 +0200
Subject: [PATCH 11/89] Second attempt at disabling Codecov annotations
 (#31841)

---
 .github/codecov.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/codecov.yml b/.github/codecov.yml
index d9b43b2594..21af6d0d45 100644
--- a/.github/codecov.yml
+++ b/.github/codecov.yml
@@ -1,4 +1,3 @@
-annotations: false
 comment: false # Do not leave PR comments
 coverage:
   status:
@@ -10,3 +9,5 @@ coverage:
       default:
         # GitHub status check is not blocking
         informational: true
+github_checks:
+  annotations: false

From 0c3c06f7cc50c9207a44f56e184ce6a41f953171 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 10 Sep 2024 13:32:58 -0400
Subject: [PATCH 12/89] Remove vendor prefix from `mobile-web-app-capable` meta
 tag (#31845)

---
 app/views/layouts/application.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a6b34c8a36..99e89d45ce 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -21,7 +21,7 @@
       %link{ rel: 'mask-icon', href: frontend_asset_path('images/logo-symbol-icon.svg'), color: '#6364FF' }/
     %link{ rel: 'manifest', href: manifest_path(format: :json) }/
     = theme_color_tags current_theme
-    %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
+    %meta{ name: 'mobile-web-app-capable', content: 'yes' }/
 
     %title= html_title
 

From e09f9f885e3d2859f495d5e5e6107bba9bde3b5a Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 10 Sep 2024 12:33:55 -0500
Subject: [PATCH 13/89] Fix alt text modal styling (#31844)

---
 app/javascript/styles/mastodon-light/diff.scss | 17 +++++++----------
 app/javascript/styles/mastodon/components.scss | 16 +++++++++-------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 1df556b42a..c0cabf837c 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -159,8 +159,8 @@
 .error-modal,
 .onboarding-modal,
 .compare-history-modal,
-.report-modal__comment .setting-text__wrapper,
-.report-modal__comment .setting-text,
+.report-modal__comment,
+.report-modal__comment,
 .announcements,
 .picture-in-picture__header,
 .picture-in-picture__footer,
@@ -169,6 +169,11 @@
   border: 1px solid var(--background-border-color);
 }
 
+.setting-text__wrapper,
+.setting-text {
+  border: 1px solid var(--background-border-color);
+}
+
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {
@@ -198,14 +203,6 @@
   color: $white;
 }
 
-.report-modal__comment {
-  border-right-color: lighten($ui-base-color, 8%);
-}
-
-.report-modal__container {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
 .column-settings__hashtags .column-select__option {
   color: $white;
 }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 570c006faa..382491eb74 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3911,7 +3911,7 @@ $ui-header-logo-wordmark-width: 99px;
 
   &__wrapper {
     background: $white;
-    border: 1px solid $ui-secondary-color;
+    border: 1px solid var(--background-border-color);
     margin-bottom: 10px;
     border-radius: 4px;
 
@@ -6298,9 +6298,10 @@ a.status-card {
 .report-modal,
 .actions-modal,
 .compare-history-modal {
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
+  background: var(--background-color);
+  color: $primary-text-color;
+  border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   overflow: hidden;
   max-width: 90vw;
   width: 480px;
@@ -6344,6 +6345,7 @@ a.status-card {
 .report-modal {
   width: 90vw;
   max-width: 700px;
+  border: 1px solid var(--background-border-color);
 }
 
 .report-dialog-modal {
@@ -6567,7 +6569,7 @@ a.status-card {
 
 .report-modal__container {
   display: flex;
-  border-top: 1px solid $ui-secondary-color;
+  border-top: 1px solid var(--background-border-color);
 
   @media screen and (width <= 480px) {
     flex-wrap: wrap;
@@ -6625,7 +6627,7 @@ a.status-card {
 
 .report-modal__comment {
   padding: 20px;
-  border-inline-end: 1px solid $ui-secondary-color;
+  border-inline-end: 1px solid var(--background-border-color);
   max-width: 320px;
 
   p {
@@ -6636,7 +6638,7 @@ a.status-card {
 
   .setting-text-label {
     display: block;
-    color: $inverted-text-color;
+    color: $secondary-text-color;
     font-size: 14px;
     font-weight: 500;
     margin-bottom: 10px;

From e6f5b36a12396daf0a8166d0d2ea8865cd589ee2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:45:16 +0200
Subject: [PATCH 14/89] Update dependency express to v4.20.0 (#31836)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 90 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 31 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 332f6d012f..90e764f49c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5470,9 +5470,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.2":
-  version: 1.20.2
-  resolution: "body-parser@npm:1.20.2"
+"body-parser@npm:1.20.3":
+  version: 1.20.3
+  resolution: "body-parser@npm:1.20.3"
   dependencies:
     bytes: "npm:3.1.2"
     content-type: "npm:~1.0.5"
@@ -5482,11 +5482,11 @@ __metadata:
     http-errors: "npm:2.0.0"
     iconv-lite: "npm:0.4.24"
     on-finished: "npm:2.4.1"
-    qs: "npm:6.11.0"
+    qs: "npm:6.13.0"
     raw-body: "npm:2.5.2"
     type-is: "npm:~1.6.18"
     unpipe: "npm:1.0.0"
-  checksum: 10c0/06f1438fff388a2e2354c96aa3ea8147b79bfcb1262dfcc2aae68ec13723d01d5781680657b74e9f83c808266d5baf52804032fbde2b7382b89bd8cdb273ace9
+  checksum: 10c0/0a9a93b7518f222885498dcecaad528cf010dd109b071bf471c93def4bfe30958b83e03496eb9c1ad4896db543d999bb62be1a3087294162a88cfa1b42c16310
   languageName: node
   linkType: hard
 
@@ -7499,6 +7499,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encodeurl@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "encodeurl@npm:2.0.0"
+  checksum: 10c0/5d317306acb13e6590e28e27924c754163946a2480de11865c991a3a7eed4315cd3fba378b543ca145829569eefe9b899f3d84bb09870f675ae60bc924b01ceb
+  languageName: node
+  linkType: hard
+
 "encoding@npm:^0.1.13":
   version: 0.1.13
   resolution: "encoding@npm:0.1.13"
@@ -8336,41 +8343,41 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.19.2
-  resolution: "express@npm:4.19.2"
+  version: 4.20.0
+  resolution: "express@npm:4.20.0"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.2"
+    body-parser: "npm:1.20.3"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
     cookie: "npm:0.6.0"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
-    encodeurl: "npm:~1.0.2"
+    encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     etag: "npm:~1.8.1"
     finalhandler: "npm:1.2.0"
     fresh: "npm:0.5.2"
     http-errors: "npm:2.0.0"
-    merge-descriptors: "npm:1.0.1"
+    merge-descriptors: "npm:1.0.3"
     methods: "npm:~1.1.2"
     on-finished: "npm:2.4.1"
     parseurl: "npm:~1.3.3"
-    path-to-regexp: "npm:0.1.7"
+    path-to-regexp: "npm:0.1.10"
     proxy-addr: "npm:~2.0.7"
     qs: "npm:6.11.0"
     range-parser: "npm:~1.2.1"
     safe-buffer: "npm:5.2.1"
-    send: "npm:0.18.0"
-    serve-static: "npm:1.15.0"
+    send: "npm:0.19.0"
+    serve-static: "npm:1.16.0"
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/e82e2662ea9971c1407aea9fc3c16d6b963e55e3830cd0ef5e00b533feda8b770af4e3be630488ef8a752d7c75c4fcefb15892868eeaafe7353cb9e3e269fdcb
+  checksum: 10c0/626e440e9feffa3f82ebce5e7dc0ad7a74fa96079994f30048cce450f4855a258abbcabf021f691aeb72154867f0d28440a8498c62888805faf667a829fb65aa
   languageName: node
   linkType: hard
 
@@ -11808,10 +11815,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-descriptors@npm:1.0.1":
-  version: 1.0.1
-  resolution: "merge-descriptors@npm:1.0.1"
-  checksum: 10c0/b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
+"merge-descriptors@npm:1.0.3":
+  version: 1.0.3
+  resolution: "merge-descriptors@npm:1.0.3"
+  checksum: 10c0/866b7094afd9293b5ea5dcd82d71f80e51514bed33b4c4e9f516795dc366612a4cbb4dc94356e943a8a6914889a914530badff27f397191b9b75cda20b6bae93
   languageName: node
   linkType: hard
 
@@ -12930,10 +12937,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:0.1.7":
-  version: 0.1.7
-  resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 10c0/50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
+"path-to-regexp@npm:0.1.10":
+  version: 0.1.10
+  resolution: "path-to-regexp@npm:0.1.10"
+  checksum: 10c0/34196775b9113ca6df88e94c8d83ba82c0e1a2063dd33bfe2803a980da8d49b91db8104f49d5191b44ea780d46b8670ce2b7f4a5e349b0c48c6779b653f1afe4
   languageName: node
   linkType: hard
 
@@ -14335,12 +14342,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:^6.11.0":
-  version: 6.11.2
-  resolution: "qs@npm:6.11.2"
+"qs@npm:6.13.0, qs@npm:^6.11.0":
+  version: 6.13.0
+  resolution: "qs@npm:6.13.0"
   dependencies:
-    side-channel: "npm:^1.0.4"
-  checksum: 10c0/4f95d4ff18ed480befcafa3390022817ffd3087fc65f146cceb40fc5edb9fa96cb31f648cae2fa96ca23818f0798bd63ad4ca369a0e22702fcd41379b3ab6571
+    side-channel: "npm:^1.0.6"
+  checksum: 10c0/62372cdeec24dc83a9fb240b7533c0fdcf0c5f7e0b83343edd7310f0ab4c8205a5e7c56406531f2e47e1b4878a3821d652be4192c841de5b032ca83619d8f860
   languageName: node
   linkType: hard
 
@@ -15614,6 +15621,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"send@npm:0.19.0":
+  version: 0.19.0
+  resolution: "send@npm:0.19.0"
+  dependencies:
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    destroy: "npm:1.2.0"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    fresh: "npm:0.5.2"
+    http-errors: "npm:2.0.0"
+    mime: "npm:1.6.0"
+    ms: "npm:2.1.3"
+    on-finished: "npm:2.4.1"
+    range-parser: "npm:~1.2.1"
+    statuses: "npm:2.0.1"
+  checksum: 10c0/ea3f8a67a8f0be3d6bf9080f0baed6d2c51d11d4f7b4470de96a5029c598a7011c497511ccc28968b70ef05508675cebff27da9151dd2ceadd60be4e6cf845e3
+  languageName: node
+  linkType: hard
+
 "serialize-javascript@npm:^5.0.1":
   version: 5.0.1
   resolution: "serialize-javascript@npm:5.0.1"
@@ -15647,15 +15675,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-static@npm:1.15.0":
-  version: 1.15.0
-  resolution: "serve-static@npm:1.15.0"
+"serve-static@npm:1.16.0":
+  version: 1.16.0
+  resolution: "serve-static@npm:1.16.0"
   dependencies:
     encodeurl: "npm:~1.0.2"
     escape-html: "npm:~1.0.3"
     parseurl: "npm:~1.3.3"
     send: "npm:0.18.0"
-  checksum: 10c0/fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
+  checksum: 10c0/d7a5beca08cc55f92998d8b87c111dd842d642404231c90c11f504f9650935da4599c13256747b0a988442a59851343271fe8e1946e03e92cd79c447b5f3ae01
   languageName: node
   linkType: hard
 

From 9e12fa254e8956f1f8765a76b2c6ea54e47cfdae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:45:32 +0000
Subject: [PATCH 15/89] Update dependency propshaft to v1 (#31832)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index de541edfbd..1f4e042f2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -601,7 +601,7 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    propshaft (0.9.1)
+    propshaft (1.0.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -691,7 +691,7 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.2)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
     request_store (1.6.0)
       rack (>= 1.4)

From a3215c0f88bb5f436bed665ad26175923544d9d4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 11 Sep 2024 09:29:18 +0200
Subject: [PATCH 16/89] Change inner borders in media galleries in web UI
 (#31852)

---
 .../mastodon/components/media_gallery.jsx     |  2 +-
 .../styles/mastodon/components.scss           | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 9a8f852128..ba54b7f903 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -327,7 +327,7 @@ class MediaGallery extends PureComponent {
     }
 
     return (
-      <div className='media-gallery' style={style} ref={this.handleRef}>
+      <div className={`media-gallery media-gallery--layout-${size}`} style={style} ref={this.handleRef}>
         {(!visible || uncached) && (
           <div className={classNames('spoiler-button', { 'spoiler-button--click-thru': uncached })}>
             {spoilerButton}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 382491eb74..5a8fa3e5c0 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6953,6 +6953,64 @@ a.status-card {
   grid-template-columns: 50% 50%;
   grid-template-rows: 50% 50%;
   gap: 2px;
+
+  &--layout-2 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+    }
+  }
+
+  &--layout-3 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(3) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-start-end-radius: 0;
+    }
+  }
+
+  &--layout-4 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+      border-end-start-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(3) {
+      border-start-start-radius: 0;
+      border-start-end-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(4) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-start-end-radius: 0;
+    }
+  }
 }
 
 .media-gallery__item {

From cee71b9892d14d934f4f14e91c4d7d7843fc13d9 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 11 Sep 2024 03:47:16 -0400
Subject: [PATCH 17/89] Remove `fa_` prefix from status visibility icon method
 (#31846)

---
 app/helpers/statuses_helper.rb                | 20 +++++++++----------
 app/views/admin/reports/_status.html.haml     |  2 +-
 .../filters/statuses/_status_filter.html.haml |  2 +-
 spec/helpers/statuses_helper_spec.rb          | 18 ++++++++---------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index d956e4fcd8..bba6d64a47 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -4,6 +4,13 @@ module StatusesHelper
   EMBEDDED_CONTROLLER = 'statuses'
   EMBEDDED_ACTION = 'embed'
 
+  VISIBLITY_ICONS = {
+    public: 'globe',
+    unlisted: 'lock_open',
+    private: 'lock',
+    direct: 'alternate_email',
+  }.freeze
+
   def nothing_here(extra_classes = '')
     content_tag(:div, class: "nothing-here #{extra_classes}") do
       t('accounts.nothing_here')
@@ -57,17 +64,8 @@ module StatusesHelper
     embedded_view? ? '_blank' : nil
   end
 
-  def fa_visibility_icon(status)
-    case status.visibility
-    when 'public'
-      material_symbol 'globe'
-    when 'unlisted'
-      material_symbol 'lock_open'
-    when 'private'
-      material_symbol 'lock'
-    when 'direct'
-      material_symbol 'alternate_email'
-    end
+  def visibility_icon(status)
+    VISIBLITY_ICONS[status.visibility.to_sym]
   end
 
   def embedded_view?
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 11be38ef84..e0870503d6 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -33,7 +33,7 @@
         = material_symbol('repeat_active')
         = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account))
       - else
-        = fa_visibility_icon(status)
+        = material_symbol visibility_icon(status)
         = t("statuses.visibilities.#{status.visibility}")
       - if status.proper.sensitive?
         ·
diff --git a/app/views/filters/statuses/_status_filter.html.haml b/app/views/filters/statuses/_status_filter.html.haml
index 31aa9ec237..d0d04638d2 100644
--- a/app/views/filters/statuses/_status_filter.html.haml
+++ b/app/views/filters/statuses/_status_filter.html.haml
@@ -29,7 +29,7 @@
         ·
         = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted'))
       ·
-      = fa_visibility_icon(status)
+      = material_symbol visibility_icon(status)
       = t("statuses.visibilities.#{status.visibility}")
       - if status.sensitive?
         ·
diff --git a/spec/helpers/statuses_helper_spec.rb b/spec/helpers/statuses_helper_spec.rb
index 8809d0afae..edd3e8f2f7 100644
--- a/spec/helpers/statuses_helper_spec.rb
+++ b/spec/helpers/statuses_helper_spec.rb
@@ -36,14 +36,14 @@ RSpec.describe StatusesHelper do
     end
   end
 
-  describe 'fa_visibility_icon' do
+  describe 'visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }
 
       it 'returns the correct fa icon' do
-        result = helper.fa_visibility_icon(status)
+        result = helper.visibility_icon(status)
 
-        expect(result).to match('material-globe')
+        expect(result).to match('globe')
       end
     end
 
@@ -51,9 +51,9 @@ RSpec.describe StatusesHelper do
       let(:status) { Status.new(visibility: 'unlisted') }
 
       it 'returns the correct fa icon' do
-        result = helper.fa_visibility_icon(status)
+        result = helper.visibility_icon(status)
 
-        expect(result).to match('material-lock_open')
+        expect(result).to match('lock_open')
       end
     end
 
@@ -61,9 +61,9 @@ RSpec.describe StatusesHelper do
       let(:status) { Status.new(visibility: 'private') }
 
       it 'returns the correct fa icon' do
-        result = helper.fa_visibility_icon(status)
+        result = helper.visibility_icon(status)
 
-        expect(result).to match('material-lock')
+        expect(result).to match('lock')
       end
     end
 
@@ -71,9 +71,9 @@ RSpec.describe StatusesHelper do
       let(:status) { Status.new(visibility: 'direct') }
 
       it 'returns the correct fa icon' do
-        result = helper.fa_visibility_icon(status)
+        result = helper.visibility_icon(status)
 
-        expect(result).to match('material-alternate_email')
+        expect(result).to match('alternate_email')
       end
     end
   end

From 9769ffdcc2d93fbb33b5daec52ea02854dbb1574 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:47:37 +0200
Subject: [PATCH 18/89] Update dependency aws-sdk-s3 to v1.161.0 (#31853)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1f4e042f2b..1564c267b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,16 +100,16 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.970.0)
-    aws-sdk-core (3.203.0)
+    aws-partitions (1.973.0)
+    aws-sdk-core (3.204.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.89.0)
+    aws-sdk-kms (1.90.0)
       aws-sdk-core (~> 3, >= 3.203.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.160.0)
+    aws-sdk-s3 (1.161.0)
       aws-sdk-core (~> 3, >= 3.203.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

From cdcd834f3c08f12eb1b7cbf66aec3c716b232663 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 11 Sep 2024 04:01:32 -0400
Subject: [PATCH 19/89] Add coverage for `AnnualReport::*` source child classes
 (#31849)

---
 .../commonly_interacted_with_accounts_spec.rb | 41 +++++++++++++++
 .../most_reblogged_accounts_spec.rb           | 41 +++++++++++++++
 spec/lib/annual_report/most_used_apps_spec.rb | 40 +++++++++++++++
 spec/lib/annual_report/percentiles_spec.rb    | 44 ++++++++++++++++
 spec/lib/annual_report/time_series_spec.rb    | 46 +++++++++++++++++
 spec/lib/annual_report/top_hashtags_spec.rb   | 43 ++++++++++++++++
 spec/lib/annual_report/top_statuses_spec.rb   | 50 +++++++++++++++++++
 .../annual_report/type_distribution_spec.rb   | 48 ++++++++++++++++++
 8 files changed, 353 insertions(+)
 create mode 100644 spec/lib/annual_report/commonly_interacted_with_accounts_spec.rb
 create mode 100644 spec/lib/annual_report/most_reblogged_accounts_spec.rb
 create mode 100644 spec/lib/annual_report/most_used_apps_spec.rb
 create mode 100644 spec/lib/annual_report/percentiles_spec.rb
 create mode 100644 spec/lib/annual_report/time_series_spec.rb
 create mode 100644 spec/lib/annual_report/top_hashtags_spec.rb
 create mode 100644 spec/lib/annual_report/top_statuses_spec.rb
 create mode 100644 spec/lib/annual_report/type_distribution_spec.rb

diff --git a/spec/lib/annual_report/commonly_interacted_with_accounts_spec.rb b/spec/lib/annual_report/commonly_interacted_with_accounts_spec.rb
new file mode 100644
index 0000000000..e99d3cb4a7
--- /dev/null
+++ b/spec/lib/annual_report/commonly_interacted_with_accounts_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::CommonlyInteractedWithAccounts do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            commonly_interacted_with_accounts: be_an(Array).and(be_empty)
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:other_account) { Fabricate :account }
+
+      before do
+        _other = Fabricate :status
+        Fabricate :status, account: account, reply: true, in_reply_to_id: Fabricate(:status, account: other_account).id
+        Fabricate :status, account: account, reply: true, in_reply_to_id: Fabricate(:status, account: other_account).id
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            commonly_interacted_with_accounts: contain_exactly(
+              include(account_id: other_account.id, count: 2)
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/most_reblogged_accounts_spec.rb b/spec/lib/annual_report/most_reblogged_accounts_spec.rb
new file mode 100644
index 0000000000..0280ba1992
--- /dev/null
+++ b/spec/lib/annual_report/most_reblogged_accounts_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::MostRebloggedAccounts do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            most_reblogged_accounts: be_an(Array).and(be_empty)
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:other_account) { Fabricate :account }
+
+      before do
+        _other = Fabricate :status
+        Fabricate :status, account: account, reblog: Fabricate(:status, account: other_account)
+        Fabricate :status, account: account, reblog: Fabricate(:status, account: other_account)
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            most_reblogged_accounts: contain_exactly(
+              include(account_id: other_account.id, count: 2)
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/most_used_apps_spec.rb b/spec/lib/annual_report/most_used_apps_spec.rb
new file mode 100644
index 0000000000..d2fcecc4d8
--- /dev/null
+++ b/spec/lib/annual_report/most_used_apps_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::MostUsedApps do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            most_used_apps: be_an(Array).and(be_empty)
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:application) { Fabricate :application }
+
+      before do
+        _other = Fabricate :status
+        Fabricate.times 2, :status, account: account, application: application
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            most_used_apps: contain_exactly(
+              include(name: application.name, count: 2)
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/percentiles_spec.rb b/spec/lib/annual_report/percentiles_spec.rb
new file mode 100644
index 0000000000..1d1df3166b
--- /dev/null
+++ b/spec/lib/annual_report/percentiles_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::Percentiles do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            percentiles: include(
+              followers: 0,
+              statuses: 0
+            )
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      before do
+        Fabricate.times 2, :status # Others as `account`
+        Fabricate.times 2, :follow # Others as `target_account`
+        Fabricate.times 2, :status, account: account
+        Fabricate.times 2, :follow, target_account: account
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            percentiles: include(
+              followers: 50,
+              statuses: 50
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/time_series_spec.rb b/spec/lib/annual_report/time_series_spec.rb
new file mode 100644
index 0000000000..219d6c0834
--- /dev/null
+++ b/spec/lib/annual_report/time_series_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::TimeSeries do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            time_series: match(
+              include(followers: 0, following: 0, month: 1, statuses: 0)
+            )
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:month_one_date) { DateTime.new(Time.zone.now.year, 1, 1, 12, 12, 12) }
+
+      let(:tag) { Fabricate :tag }
+
+      before do
+        _other = Fabricate :status
+        Fabricate :status, account: account, created_at: month_one_date
+        Fabricate :follow, account: account, created_at: month_one_date
+        Fabricate :follow, target_account: account, created_at: month_one_date
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            time_series: match(
+              include(followers: 1, following: 1, month: 1, statuses: 1)
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/top_hashtags_spec.rb b/spec/lib/annual_report/top_hashtags_spec.rb
new file mode 100644
index 0000000000..58a9152184
--- /dev/null
+++ b/spec/lib/annual_report/top_hashtags_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::TopHashtags do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            top_hashtags: be_an(Array).and(be_empty)
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:tag) { Fabricate :tag }
+
+      before do
+        _other = Fabricate :status
+        first = Fabricate :status, account: account
+        first.tags << tag
+        last = Fabricate :status, account: account
+        last.tags << tag
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            top_hashtags: contain_exactly(
+              include(name: tag.name, count: 2)
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/top_statuses_spec.rb b/spec/lib/annual_report/top_statuses_spec.rb
new file mode 100644
index 0000000000..b956b03973
--- /dev/null
+++ b/spec/lib/annual_report/top_statuses_spec.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::TopStatuses do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            top_statuses: include(
+              by_reblogs: be_nil,
+              by_favourites: be_nil,
+              by_replies: be_nil
+            )
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      let(:reblogged_status) { Fabricate :status, account: account }
+      let(:favourited_status) { Fabricate :status, account: account }
+      let(:replied_status) { Fabricate :status, account: account }
+
+      before do
+        _other = Fabricate :status
+        reblogged_status.status_stat.update(reblogs_count: 123)
+        favourited_status.status_stat.update(favourites_count: 123)
+        replied_status.status_stat.update(replies_count: 123)
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            top_statuses: include(
+              by_reblogs: reblogged_status.id,
+              by_favourites: favourited_status.id,
+              by_replies: replied_status.id
+            )
+          )
+      end
+    end
+  end
+end
diff --git a/spec/lib/annual_report/type_distribution_spec.rb b/spec/lib/annual_report/type_distribution_spec.rb
new file mode 100644
index 0000000000..89a31fb207
--- /dev/null
+++ b/spec/lib/annual_report/type_distribution_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::TypeDistribution do
+  describe '#generate' do
+    subject { described_class.new(account, Time.zone.now.year) }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            type_distribution: include(
+              total: 0,
+              reblogs: 0,
+              replies: 0,
+              standalone: 0
+            )
+          )
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      before do
+        _other = Fabricate :status
+        Fabricate :status, reblog: Fabricate(:status), account: account
+        Fabricate :status, in_reply_to_id: Fabricate(:status).id, account: account, reply: true
+        Fabricate :status, account: account
+      end
+
+      it 'builds a report for an account' do
+        expect(subject.generate)
+          .to include(
+            type_distribution: include(
+              total: 3,
+              reblogs: 1,
+              replies: 1,
+              standalone: 1
+            )
+          )
+      end
+    end
+  end
+end

From 2babfafaffd56ff69b6213f3a550c7d0b3d3283c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:18:10 +0200
Subject: [PATCH 20/89] New Crowdin Translations (automated) (#31855)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  1 -
 app/javascript/mastodon/locales/ar.json      |  1 -
 app/javascript/mastodon/locales/ast.json     |  1 -
 app/javascript/mastodon/locales/be.json      |  1 -
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/bn.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  2 +-
 app/javascript/mastodon/locales/ckb.json     |  1 -
 app/javascript/mastodon/locales/co.json      |  1 -
 app/javascript/mastodon/locales/cs.json      |  1 -
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      |  2 +-
 app/javascript/mastodon/locales/de.json      |  2 +-
 app/javascript/mastodon/locales/el.json      |  1 -
 app/javascript/mastodon/locales/en-GB.json   |  4 +-
 app/javascript/mastodon/locales/eo.json      |  1 -
 app/javascript/mastodon/locales/es-AR.json   |  1 -
 app/javascript/mastodon/locales/es-MX.json   |  1 -
 app/javascript/mastodon/locales/es.json      |  1 -
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  1 -
 app/javascript/mastodon/locales/fa.json      |  1 -
 app/javascript/mastodon/locales/fi.json      |  2 +-
 app/javascript/mastodon/locales/fo.json      |  4 +-
 app/javascript/mastodon/locales/fr-CA.json   |  1 -
 app/javascript/mastodon/locales/fr.json      |  1 -
 app/javascript/mastodon/locales/fy.json      |  1 -
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  6 +--
 app/javascript/mastodon/locales/he.json      |  2 +-
 app/javascript/mastodon/locales/hi.json      |  1 +
 app/javascript/mastodon/locales/hr.json      |  1 -
 app/javascript/mastodon/locales/hu.json      |  2 +-
 app/javascript/mastodon/locales/hy.json      |  1 -
 app/javascript/mastodon/locales/ia.json      |  3 +-
 app/javascript/mastodon/locales/id.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  4 +-
 app/javascript/mastodon/locales/it.json      |  2 +-
 app/javascript/mastodon/locales/ja.json      |  1 -
 app/javascript/mastodon/locales/ka.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  1 -
 app/javascript/mastodon/locales/kk.json      |  1 -
 app/javascript/mastodon/locales/ko.json      | 22 +++++------
 app/javascript/mastodon/locales/ku.json      |  1 -
 app/javascript/mastodon/locales/kw.json      |  1 -
 app/javascript/mastodon/locales/la.json      |  1 -
 app/javascript/mastodon/locales/lad.json     |  1 -
 app/javascript/mastodon/locales/lt.json      |  2 +-
 app/javascript/mastodon/locales/lv.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/my.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  2 +-
 app/javascript/mastodon/locales/nn.json      |  4 +-
 app/javascript/mastodon/locales/no.json      |  1 -
 app/javascript/mastodon/locales/oc.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  2 +-
 app/javascript/mastodon/locales/pt-BR.json   |  4 +-
 app/javascript/mastodon/locales/pt-PT.json   |  1 -
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sa.json      |  1 -
 app/javascript/mastodon/locales/sc.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      |  1 -
 app/javascript/mastodon/locales/sq.json      |  4 +-
 app/javascript/mastodon/locales/sr-Latn.json |  1 -
 app/javascript/mastodon/locales/sr.json      |  1 -
 app/javascript/mastodon/locales/sv.json      |  2 +-
 app/javascript/mastodon/locales/ta.json      |  1 -
 app/javascript/mastodon/locales/te.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tok.json     |  1 -
 app/javascript/mastodon/locales/tr.json      |  2 +-
 app/javascript/mastodon/locales/uk.json      |  5 ++-
 app/javascript/mastodon/locales/uz.json      |  1 -
 app/javascript/mastodon/locales/vi.json      |  1 -
 app/javascript/mastodon/locales/zgh.json     |  1 -
 app/javascript/mastodon/locales/zh-CN.json   |  2 +-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  2 +-
 config/locales/activerecord.ca.yml           |  6 +++
 config/locales/activerecord.da.yml           |  6 +++
 config/locales/activerecord.de.yml           |  6 +++
 config/locales/activerecord.en-GB.yml        |  6 +++
 config/locales/activerecord.fi.yml           |  6 +++
 config/locales/activerecord.fo.yml           |  6 +++
 config/locales/activerecord.gl.yml           |  6 +++
 config/locales/activerecord.he.yml           |  6 +++
 config/locales/activerecord.hu.yml           |  6 +++
 config/locales/activerecord.ia.yml           |  5 +++
 config/locales/activerecord.is.yml           |  6 +++
 config/locales/activerecord.it.yml           |  6 +++
 config/locales/activerecord.lt.yml           |  6 +++
 config/locales/activerecord.nl.yml           |  6 +++
 config/locales/activerecord.nn.yml           |  6 +++
 config/locales/activerecord.pl.yml           |  6 +++
 config/locales/activerecord.pt-BR.yml        |  6 +++
 config/locales/activerecord.sv.yml           |  2 +
 config/locales/activerecord.tr.yml           |  6 +++
 config/locales/activerecord.uk.yml           |  6 +++
 config/locales/activerecord.zh-CN.yml        |  6 +++
 config/locales/activerecord.zh-TW.yml        |  6 +++
 config/locales/ca.yml                        | 20 ++++++++++
 config/locales/da.yml                        |  7 ++++
 config/locales/de.yml                        |  8 ++++
 config/locales/en-GB.yml                     | 41 ++++++++++++++++++++
 config/locales/fi.yml                        |  5 +++
 config/locales/fo.yml                        |  8 ++++
 config/locales/gl.yml                        |  7 ++++
 config/locales/he.yml                        |  8 ++++
 config/locales/hu.yml                        | 10 ++++-
 config/locales/ia.yml                        |  6 +++
 config/locales/is.yml                        |  8 ++++
 config/locales/it.yml                        |  7 ++++
 config/locales/lt.yml                        |  8 ++++
 config/locales/nl.yml                        |  7 ++++
 config/locales/nn.yml                        | 10 +++++
 config/locales/pl.yml                        |  8 ++++
 config/locales/pt-BR.yml                     | 11 ++++++
 config/locales/simple_form.ca.yml            |  2 +
 config/locales/simple_form.da.yml            |  2 +
 config/locales/simple_form.de.yml            |  2 +
 config/locales/simple_form.en-GB.yml         |  3 ++
 config/locales/simple_form.fi.yml            |  1 +
 config/locales/simple_form.fo.yml            |  2 +
 config/locales/simple_form.gl.yml            |  2 +
 config/locales/simple_form.he.yml            |  2 +
 config/locales/simple_form.hu.yml            |  2 +
 config/locales/simple_form.ia.yml            |  1 +
 config/locales/simple_form.is.yml            |  2 +
 config/locales/simple_form.it.yml            |  2 +
 config/locales/simple_form.lt.yml            |  2 +
 config/locales/simple_form.nl.yml            |  2 +
 config/locales/simple_form.nn.yml            |  3 ++
 config/locales/simple_form.pl.yml            |  2 +
 config/locales/simple_form.pt-BR.yml         |  3 ++
 config/locales/simple_form.tr.yml            |  2 +
 config/locales/simple_form.uk.yml            |  2 +
 config/locales/simple_form.zh-CN.yml         |  2 +
 config/locales/simple_form.zh-TW.yml         |  2 +
 config/locales/sq.yml                        |  1 +
 config/locales/sv.yml                        |  4 ++
 config/locales/tr.yml                        |  9 ++++-
 config/locales/uk.yml                        |  8 ++++
 config/locales/zh-CN.yml                     |  7 ++++
 config/locales/zh-TW.yml                     |  7 ++++
 151 files changed, 435 insertions(+), 99 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 7974cea640..893882fe7a 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -308,7 +308,6 @@
   "lists.search": "Buscar entre la chent a la quala sigues",
   "lists.subheading": "Las tuyas listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imachen} other {Amaga las imáchens}}",
   "moved_to_account_banner.text": "La tuya cuenta {disabledAccount} ye actualment deshabilitada perque t'has mudau a {movedToAccount}.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.blocks": "Usuarios blocaus",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 722f2bc98b..0dbeb0a190 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -443,7 +443,6 @@
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
   "loading_indicator.label": "جاري التحميل…",
-  "media_gallery.toggle_visible": "{number, plural, zero {} one {اخف الصورة} two {اخف الصورتين} few {اخف الصور} many {اخف الصور} other {اخف الصور}}",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.hide_from_notifications": "إخفاء من قائمة الإشعارات",
   "mute_modal.hide_options": "إخفاء الخيارات",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 74eb7021d3..507703023c 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -268,7 +268,6 @@
   "lists.search": "Buscar ente los perfiles que sigues",
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 57431b0a57..412eae1481 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -437,7 +437,6 @@
   "lists.subheading": "Вашыя спісы",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
   "loading_indicator.label": "Загрузка…",
-  "media_gallery.toggle_visible": "{number, plural, one {Схаваць відарыс} other {Схаваць відарысы}}",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
   "mute_modal.hide_options": "Схаваць опцыі",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 828092d430..b89b539dcf 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -444,7 +444,6 @@
   "lists.subheading": "Вашите списъци",
   "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
   "loading_indicator.label": "Зареждане…",
-  "media_gallery.toggle_visible": "Скриване на {number, plural, one {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Скриване от известията",
   "mute_modal.hide_options": "Скриване на възможностите",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 584bf303b1..df97abdff5 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -288,7 +288,6 @@
   "lists.search": "যাদের অনুসরণ করেন তাদের ভেতরে খুঁজুন",
   "lists.subheading": "আপনার তালিকা",
   "load_pending": "{count, plural, one {# নতুন জিনিস} other {# নতুন জিনিস}}",
-  "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
   "navigation_bar.about": "পরিচিতি",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
   "navigation_bar.bookmarks": "বুকমার্ক",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index c8bb4975de..226ff756ff 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -360,7 +360,6 @@
   "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ…",
-  "media_gallery.toggle_visible": "{number, plural, one {Kuzhat ar skeudenn} other {Kuzhat ar skeudenn}}",
   "navigation_bar.about": "Diwar-benn",
   "navigation_bar.blocks": "Implijer·ezed·ien berzet",
   "navigation_bar.bookmarks": "Sinedoù",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 5981c1df84..91f28bd151 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Les teves llistes",
   "load_pending": "{count, plural, one {# element nou} other {# elements nous}}",
   "loading_indicator.label": "Es carrega…",
-  "media_gallery.toggle_visible": "{number, plural, one {Amaga la imatge} other {Amaga les imatges}}",
+  "media_gallery.hide": "Amaga",
   "moved_to_account_banner.text": "El teu compte {disabledAccount} està desactivat perquè l'has mogut a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Amaga de les notificacions",
   "mute_modal.hide_options": "Amaga les opcions",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 9def7533ae..61b81c9f31 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -355,7 +355,6 @@
   "lists.search": "بگەڕێ لەناو ئەو کەسانەی کە شوێنیان کەوتویت",
   "lists.subheading": "لیستەکانت",
   "load_pending": "{count, plural, one {# بەڕگەی نوێ} other {# بەڕگەی نوێ}}",
-  "media_gallery.toggle_visible": "شاردنەوەی {number, plural, one {image} other {images}}",
   "moved_to_account_banner.text": "ئەکاونتەکەت {disabledAccount} لە ئێستادا لەکارخراوە چونکە تۆ چوویتە {movedToAccount}.",
   "navigation_bar.about": "دەربارە",
   "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 3a72ecd3fb..180616b782 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -214,7 +214,6 @@
   "lists.search": "Circà indè i vostr'abbunamenti",
   "lists.subheading": "E vo liste",
   "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
-  "media_gallery.toggle_visible": "Piattà {number, plural, one {ritrattu} other {ritratti}}",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 116a9c0148..8dd8f31fa8 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -435,7 +435,6 @@
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
   "loading_indicator.label": "Načítání…",
-  "media_gallery.toggle_visible": "{number, plural, one {Skrýt obrázek} few {Skrýt obrázky} many {Skrýt obrázky} other {Skrýt obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skrýt z notifikací",
   "mute_modal.hide_options": "Skrýt možnosti",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 158f31aeb3..d34b7a970d 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Eich rhestrau",
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Yn llwytho…",
-  "media_gallery.toggle_visible": "{number, plural, one {Cuddio delwedd} other {Cuddio delwedd}}",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
   "mute_modal.hide_options": "Cuddio'r dewis",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 4155dc9fc5..dea313ffed 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural, one {# nyt emne} other {# nye emner}}",
   "loading_indicator.label": "Indlæser…",
-  "media_gallery.toggle_visible": "{number, plural, one {Skjul billede} other {Skjul billeder}}",
+  "media_gallery.hide": "Skjul",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
   "mute_modal.hide_options": "Skjul valgmuligheder",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index e37a595469..46bb08d7cb 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Deine Listen",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
   "loading_indicator.label": "Wird geladen …",
-  "media_gallery.toggle_visible": "{number, plural, one {Medium ausblenden} other {Medien ausblenden}}",
+  "media_gallery.hide": "Ausblenden",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
   "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
   "mute_modal.hide_options": "Einstellungen ausblenden",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index a3adaaf9d1..64a603923e 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -452,7 +452,6 @@
   "lists.subheading": "Οι λίστες σου",
   "load_pending": "{count, plural, one {# νέο στοιχείο} other {# νέα στοιχεία}}",
   "loading_indicator.label": "Φόρτωση…",
-  "media_gallery.toggle_visible": "{number, plural, one {Απόκρυψη εικόνας} other {Απόκρυψη εικόνων}}",
   "moved_to_account_banner.text": "Ο λογαριασμός σου {disabledAccount} είναι προσωρινά απενεργοποιημένος επειδή μεταφέρθηκες στον {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Απόκρυψη από ειδοποιήσεις",
   "mute_modal.hide_options": "Απόκρυψη επιλογών",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index e9007c8654..c727b8e49f 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading…",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "media_gallery.hide": "Hide",
   "moved_to_account_banner.text": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Hide from notifications",
   "mute_modal.hide_options": "Hide options",
@@ -780,6 +780,7 @@
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
+  "status.continued_thread": "Continued thread",
   "status.copy": "Copy link to status",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
+  "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 40eee9805a..d8ec27748e 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -390,7 +390,6 @@
   "lists.subheading": "Viaj listoj",
   "load_pending": "{count,plural, one {# nova elemento} other {# novaj elementoj}}",
   "loading_indicator.label": "Ŝargado…",
-  "media_gallery.toggle_visible": "{number, plural, one {Kaŝi la bildon} other {Kaŝi la bildojn}}",
   "moved_to_account_banner.text": "Via konto {disabledAccount} estas malvalidigita ĉar vi movis ĝin al {movedToAccount}.",
   "navigation_bar.about": "Pri",
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 20d93ed011..a0f91c4760 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
   "loading_indicator.label": "Cargando…",
-  "media_gallery.toggle_visible": "Ocultar {number, plural, one {imagen} other {imágenes}}",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar en las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 348300f728..63f3d53812 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
-  "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 85b160d7a8..b01eb68222 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
-  "media_gallery.toggle_visible": "Cambiar visibilidad",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index d0fc80e60c..ca37a152fe 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Sinu nimekirjad",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laadimine…",
-  "media_gallery.toggle_visible": "{number, plural, one {Varja pilt} other {Varja pildid}}",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Peida teavituste hulgast",
   "mute_modal.hide_options": "Peida valikud",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index f169e2905b..15dd63486b 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Zure zerrendak",
   "load_pending": "{count, plural, one {elementu berri #} other {# elementu berri}}",
   "loading_indicator.label": "Kargatzen…",
-  "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
   "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
   "mute_modal.hide_options": "Ezkutatu aukerak",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 50c376b3bd..d2b520e1d2 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -447,7 +447,6 @@
   "lists.subheading": "سیاهه‌هایتان",
   "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}",
   "loading_indicator.label": "در حال بارگذاری…",
-  "media_gallery.toggle_visible": "{number, plural, one {نهفتن تصویر} other {نهفتن تصاویر}}",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
   "mute_modal.hide_from_notifications": "نهفتن از آگاهی‌ها",
   "mute_modal.hide_options": "گزینه‌های نهفتن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 8f9cc5fe4d..d8c5b72040 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Omat listasi",
   "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
-  "media_gallery.toggle_visible": "{number, plural, one {Piilota kuva} other {Piilota kuvat}}",
+  "media_gallery.hide": "Piilota",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Piilota ilmoituksista",
   "mute_modal.hide_options": "Piilota vaihtoehdot",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index d4e5d9ad54..6e7eb3b7c2 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -457,7 +457,7 @@
   "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}}",
+  "media_gallery.hide": "Fjal",
   "moved_to_account_banner.text": "Konta tín {disabledAccount} er í løtuni óvirkin, tí tú flutti til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Fjal boð",
   "mute_modal.hide_options": "Fjal valmøguleikar",
@@ -780,6 +780,7 @@
   "status.bookmark": "Goym",
   "status.cancel_reblog_private": "Strika stimbran",
   "status.cannot_reblog": "Tað ber ikki til at stimbra hendan postin",
+  "status.continued_thread": "Framhaldandi tráður",
   "status.copy": "Kopiera leinki til postin",
   "status.delete": "Strika",
   "status.detailed_status": "Útgreinað samrøðusýni",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
   "status.redraft": "Strika & ger nýggja kladdu",
   "status.remove_bookmark": "Gloym",
+  "status.replied_in_thread": "Svaraði í tráðnum",
   "status.replied_to": "Svaraði {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara tráðnum",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index a1d4061eba..9f51aaaa7d 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -456,7 +456,6 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 9f55634b29..5bcc1c946b 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -456,7 +456,6 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
-  "media_gallery.toggle_visible": "{number, plural, one {Cacher l’image} other {Cacher les images}}",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index bb409b63c1..badd6a1c21 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Jo listen",
   "load_pending": "{count, plural, one {# nij item} other {# nije items}}",
   "loading_indicator.label": "Lade…",
-  "media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
   "mute_modal.hide_from_notifications": "Meldingen ferstopje",
   "mute_modal.hide_options": "Opsjes ferstopje",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index b51d4adf68..95bb293854 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Do liostaí",
   "load_pending": "{count, plural, one {# mír nua} two {# mír nua} few {# mír nua} many {# mír nua} other {# mír nua}}",
   "loading_indicator.label": "Á lódáil…",
-  "media_gallery.toggle_visible": "{number, plural, one {Folaigh íomhá} two {Folaigh íomhánna} few {Folaigh íomhánna} many {Folaigh íomhánna} other {Folaigh íomhánna}}",
   "moved_to_account_banner.text": "Tá do chuntas {disabledAccount} díchumasaithe faoi láthair toisc gur bhog tú go {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Folaigh ó fhógraí",
   "mute_modal.hide_options": "Folaigh roghanna",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 1090df0881..e2f67bc296 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
   "loading_indicator.label": "’Ga luchdadh…",
-  "media_gallery.toggle_visible": "{number, plural, 1 {Falaich an dealbh} one {Falaich na dealbhan} two {Falaich na dealbhan} few {Falaich na dealbhan} other {Falaich na dealbhan}}",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Falaich o na brathan",
   "mute_modal.hide_options": "Roghainnean falaich",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index df477fe9e2..b0b530e88f 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -315,7 +315,7 @@
   "follow_suggestions.curated_suggestion": "Suxestións do Servidor",
   "follow_suggestions.dismiss": "Non mostrar máis",
   "follow_suggestions.featured_longer": "Elección persoal do equipo de {domain}",
-  "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que sigues",
+  "follow_suggestions.friends_of_friends_longer": "Popular entre as persoas que segues",
   "follow_suggestions.hints.featured": "Este perfil foi escollido pola administración de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil é popular entre as persoas que segues.",
   "follow_suggestions.hints.most_followed": "Este perfil é un dos máis seguidos en {domain}.",
@@ -457,9 +457,9 @@
   "lists.subheading": "As túas listaxes",
   "load_pending": "{count, plural, one {# novo elemento} other {# novos elementos}}",
   "loading_indicator.label": "Estase a cargar…",
-  "media_gallery.toggle_visible": "Agochar {number, plural, one {imaxe} other {imaxes}}",
+  "media_gallery.hide": "Agochar",
   "moved_to_account_banner.text": "A túa conta {disabledAccount} está actualmente desactivada porque movéchela a {movedToAccount}.",
-  "mute_modal.hide_from_notifications": "Ocultar nas notificacións",
+  "mute_modal.hide_from_notifications": "Agochar nas notificacións",
   "mute_modal.hide_options": "Opcións ao ocultar",
   "mute_modal.indefinite": "Ata que as reactive",
   "mute_modal.show_options": "Mostrar opcións",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 47fc444e88..80d9f054cc 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -457,7 +457,7 @@
   "lists.subheading": "הרשימות שלך",
   "load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
   "loading_indicator.label": "בטעינה…",
-  "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {להסתיר תמונותיים} many {להסתיר תמונות} other {להסתיר תמונות}}",
+  "media_gallery.hide": "להסתיר",
   "moved_to_account_banner.text": "חשבונך {disabledAccount} אינו פעיל כרגע עקב מעבר ל{movedToAccount}.",
   "mute_modal.hide_from_notifications": "להסתיר מהתראות",
   "mute_modal.hide_options": "הסתרת אפשרויות",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 0b40251730..58b04a20cd 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -367,6 +367,7 @@
   "lists.replies_policy.none": "कोई नहीं",
   "lists.replies_policy.title": "इसके जवाब दिखाएं:",
   "lists.subheading": "आपकी सूचियाँ",
+  "media_gallery.hide": "छिपाएं",
   "navigation_bar.about": "विवरण",
   "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 0b42c49338..9f5782767b 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -310,7 +310,6 @@
   "lists.replies_policy.none": "Nitko",
   "lists.search": "Traži među praćenim ljudima",
   "lists.subheading": "Vaše liste",
-  "media_gallery.toggle_visible": "Sakrij {number, plural, one {sliku} other {slike}}",
   "navigation_bar.about": "O aplikaciji",
   "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
   "navigation_bar.blocks": "Blokirani korisnici",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index f0f08ca50c..1e4e02cb9d 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Saját listák",
   "load_pending": "{count, plural, one {# új elem} other {# új elem}}",
   "loading_indicator.label": "Betöltés…",
-  "media_gallery.toggle_visible": "{number, plural, one {Kép elrejtése} other {Képek elrejtése}}",
+  "media_gallery.hide": "Elrejtés",
   "moved_to_account_banner.text": "A(z) {disabledAccount} fiókod jelenleg le van tiltva, mert átköltöztél ide: {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Elrejtés az értesítések közül",
   "mute_modal.hide_options": "Beállítások elrejtése",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 1d82e884ff..d1475338fd 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -289,7 +289,6 @@
   "lists.search": "Փնտրել քո հետեւած մարդկանց մէջ",
   "lists.subheading": "Քո ցանկերը",
   "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
-  "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "navigation_bar.about": "Մասին",
   "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
   "navigation_bar.bookmarks": "Էջանիշեր",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 8a448920c1..9d7e3ff2c7 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -447,7 +447,7 @@
   "lists.subheading": "Tu listas",
   "load_pending": "{count, plural, one {# nove entrata} other {# nove entratas}}",
   "loading_indicator.label": "Cargante…",
-  "media_gallery.toggle_visible": "{number, plural, one {Celar imagine} other {Celar imagines}}",
+  "media_gallery.hide": "Celar",
   "moved_to_account_banner.text": "Tu conto {disabledAccount} es actualmente disactivate perque tu ha cambiate de conto a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Celar in notificationes",
   "mute_modal.hide_options": "Celar optiones",
@@ -784,6 +784,7 @@
   "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
   "status.redraft": "Deler e reconciper",
   "status.remove_bookmark": "Remover marcapagina",
+  "status.replied_in_thread": "Respondite in le discussion",
   "status.replied_to": "Respondite a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al discussion",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 29f0bfda9d..3e2cc03145 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -403,7 +403,6 @@
   "lists.subheading": "Daftar Anda",
   "load_pending": "{count, plural, other {# item baru}}",
   "loading_indicator.label": "Memuat…",
-  "media_gallery.toggle_visible": "Tampil/Sembunyikan",
   "moved_to_account_banner.text": "Akun {disabledAccount} Anda kini dinonaktifkan karena Anda pindah ke {movedToAccount}.",
   "mute_modal.hide_options": "Sembunyikan opsi",
   "mute_modal.title": "Bisukan pengguna?",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 4002767cf9..7a176dfbb6 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -419,7 +419,6 @@
   "lists.subheading": "Tui listes",
   "load_pending": "{count, plural, one {# nov element} other {# nov elementes}}",
   "loading_indicator.label": "Cargant…",
-  "media_gallery.toggle_visible": "{number, plural, one {Celar image} other {Celar images}}",
   "moved_to_account_banner.text": "Tui conto {disabledAccount} es actualmen desactivisat pro que tu movet te a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Celar de notificationes",
   "mute_modal.hide_options": "Celar optiones",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 1329875185..d0ccb923ba 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -362,7 +362,6 @@
   "lists.subheading": "Vua listi",
   "load_pending": "{count, plural, one {# nova kozo} other {# nova kozi}}",
   "loading_indicator.label": "Kargante…",
-  "media_gallery.toggle_visible": "Chanjar videbleso",
   "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
   "navigation_bar.about": "Pri co",
   "navigation_bar.advanced_interface": "Apertez per retintervizajo",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 54fbee48e6..83932f1b4b 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Listarnir þínir",
   "load_pending": "{count, plural, one {# nýtt atriði} other {# ný atriði}}",
   "loading_indicator.label": "Hleð inn…",
-  "media_gallery.toggle_visible": "Víxla sýnileika",
+  "media_gallery.hide": "Fela",
   "moved_to_account_banner.text": "Aðgangurinn þinn {disabledAccount} er óvirkur í augnablikinu vegna þess að þú fluttir þig yfir á {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Fela úr tilkynningum",
   "mute_modal.hide_options": "Fela valkosti",
@@ -780,6 +780,7 @@
   "status.bookmark": "Bókamerki",
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
+  "status.continued_thread": "Hélt samtali áfram",
   "status.copy": "Afrita tengil í færslu",
   "status.delete": "Eyða",
   "status.detailed_status": "Nákvæm spjallþráðasýn",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
+  "status.replied_in_thread": "Svaraði í samtali",
   "status.replied_to": "Svaraði til {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara þræði",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 46d1fdd7ab..1c8cff5490 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Le tue liste",
   "load_pending": "{count, plural, one {# nuovo oggetto} other {# nuovi oggetti}}",
   "loading_indicator.label": "Caricamento…",
-  "media_gallery.toggle_visible": "{number, plural, one {Nascondi immagine} other {Nascondi immagini}}",
+  "media_gallery.hide": "Nascondi",
   "moved_to_account_banner.text": "Il tuo profilo {disabledAccount} è correntemente disabilitato perché ti sei spostato a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Nascondi dalle notifiche",
   "mute_modal.hide_options": "Nascondi le opzioni",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 489ff9c8e7..60dd8b12ea 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -457,7 +457,6 @@
   "lists.subheading": "あなたのリスト",
   "load_pending": "{count}件の新着",
   "loading_indicator.label": "読み込み中…",
-  "media_gallery.toggle_visible": "{number, plural, one {画像を閉じる} other {画像を閉じる}}",
   "moved_to_account_banner.text": "あなたのアカウント『{disabledAccount}』は『{movedToAccount}』に移動したため現在無効になっています。",
   "mute_modal.hide_from_notifications": "通知をオフにする",
   "mute_modal.hide_options": "オプションを閉じる",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 5713fe60ee..0bd86a2476 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -153,7 +153,6 @@
   "lists.new.title_placeholder": "ახალი სიის სათაური",
   "lists.search": "ძებნა ადამიანებს შორის რომელთაც მიჰყვებით",
   "lists.subheading": "თქვენი სიები",
-  "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index a1e95fd8d1..ae783b6c24 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -351,7 +351,6 @@
   "lists.subheading": "Tibdarin-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d …",
-  "media_gallery.toggle_visible": "{number, plural, one {Ffer tugna} other {Ffer tugniwin}}",
   "mute_modal.hide_from_notifications": "Ffer-it deg ulɣuten",
   "mute_modal.hide_options": "Ffer tinefrunin",
   "mute_modal.indefinite": "Alamma ssnesreɣ asgugem fell-as",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 85b2fdc005..eace5d95b8 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -222,7 +222,6 @@
   "lists.search": "Сіз іздеген адамдар арасында іздеу",
   "lists.subheading": "Тізімдеріңіз",
   "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
-  "media_gallery.toggle_visible": "Көрінуді қосу",
   "navigation_bar.blocks": "Бұғатталғандар",
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index b3d3476e4f..4c78f4332e 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -34,9 +34,9 @@
   "account.follow_back": "맞팔로우 하기",
   "account.followers": "팔로워",
   "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
-  "account.followers_counter": "{count, plural, other {{counter} 팔로워}}",
+  "account.followers_counter": "{count, plural, other {팔로워 {counter}명}}",
   "account.following": "팔로잉",
-  "account.following_counter": "{count, plural, other {{counter} 팔로잉}}",
+  "account.following_counter": "{count, plural, other {팔로잉 {counter}명}}",
   "account.follows.empty": "이 사용자는 아직 아무도 팔로우하고 있지 않습니다.",
   "account.go_to_profile": "프로필로 이동",
   "account.hide_reblogs": "@{name}의 부스트를 숨기기",
@@ -62,7 +62,7 @@
   "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.share": "@{name}의 프로필 공유",
   "account.show_reblogs": "@{name}의 부스트 보기",
-  "account.statuses_counter": "{count, plural, other {{counter} 게시물}}",
+  "account.statuses_counter": "{count, plural, other {게시물 {counter}개}}",
   "account.unblock": "차단 해제",
   "account.unblock_domain": "도메인 {domain} 차단 해제",
   "account.unblock_short": "차단 해제",
@@ -156,7 +156,7 @@
   "compose_form.placeholder": "지금 무슨 생각을 하고 있나요?",
   "compose_form.poll.duration": "투표 기간",
   "compose_form.poll.multiple": "다중 선택",
-  "compose_form.poll.option_placeholder": "{option}번째 항목",
+  "compose_form.poll.option_placeholder": "{number}번째 옵션",
   "compose_form.poll.single": "단일 선택",
   "compose_form.poll.switch_to_multiple": "다중 선택이 가능한 투표로 변경",
   "compose_form.poll.switch_to_single": "단일 선택 투표로 변경",
@@ -347,12 +347,12 @@
   "hashtag.column_settings.tag_mode.any": "어느것이든",
   "hashtag.column_settings.tag_mode.none": "이것들을 제외하고",
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
-  "hashtag.counter_by_accounts": "{count, plural, other {{counter} 명의 참여자}}",
-  "hashtag.counter_by_uses": "{count, plural, other {{counter} 개의 게시물}}",
-  "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
-  "hashtag.follow": "팔로우",
-  "hashtag.unfollow": "팔로우 해제",
-  "hashtags.and_other": "…그리고 {count, plural,other {# 개 더}}",
+  "hashtag.counter_by_accounts": "{count, plural, other {참여자 {counter}명}}",
+  "hashtag.counter_by_uses": "{count, plural, other {게시물 {counter}개}}",
+  "hashtag.counter_by_uses_today": "금일 {count, plural, other {게시물 {counter}개}}",
+  "hashtag.follow": "해시태그 팔로우",
+  "hashtag.unfollow": "해시태그 팔로우 해제",
+  "hashtags.and_other": "…및 {count, plural,other {#개}}",
   "hints.profiles.followers_may_be_missing": "이 프로필의 팔로워 목록은 일부 누락되었을 수 있습니다.",
   "hints.profiles.follows_may_be_missing": "이 프로필의 팔로우 목록은 일부 누락되었을 수 있습니다.",
   "hints.profiles.posts_may_be_missing": "이 프로필의 게시물은 일부 누락되었을 수 있습니다.",
@@ -457,7 +457,7 @@
   "lists.subheading": "리스트",
   "load_pending": "{count, plural, other {#}} 개의 새 항목",
   "loading_indicator.label": "불러오는 중...",
-  "media_gallery.toggle_visible": "이미지 숨기기",
+  "media_gallery.hide": "숨기기",
   "moved_to_account_banner.text": "당신의 계정 {disabledAccount}는 {movedToAccount}로 이동하였기 때문에 현재 비활성화 상태입니다.",
   "mute_modal.hide_from_notifications": "알림에서 숨기기",
   "mute_modal.hide_options": "옵션 숨기기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 73cfa69f42..d69f4b0d05 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -313,7 +313,6 @@
   "lists.search": "Di navbera kesên ku te dişopînin bigere",
   "lists.subheading": "Lîsteyên te",
   "load_pending": "{count, plural, one {# hêmaneke nû} other {#hêmaneke nû}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Wêneyê veşêre} other {Wêneyan veşêre}}",
   "moved_to_account_banner.text": "Ajimêrê te {disabledAccount} niha neçalak e ji ber ku te bar kir bo {movedToAccount}.",
   "navigation_bar.about": "Derbar",
   "navigation_bar.blocks": "Bikarhênerên astengkirî",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 0d60d09e30..046910daf8 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -213,7 +213,6 @@
   "lists.search": "Hwilas yn-mysk tus a holyewgh",
   "lists.subheading": "Agas rolyow",
   "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
-  "media_gallery.toggle_visible": "Hide {number, plural, one {aven} other {aven}}",
   "navigation_bar.blocks": "Devnydhyoryon lettys",
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index dc07961441..d894cc01c6 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -141,7 +141,6 @@
   "lists.new.create": "Addere tabella",
   "lists.subheading": "Tuae tabulae",
   "load_pending": "{count, plural, one {# novum item} other {# nova itema}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Cēla imaginem} other {Cēla imagines}}",
   "moved_to_account_banner.text": "Tua ratione {disabledAccount} interdum reposita est, quod ad {movedToAccount} migrāvisti.",
   "mute_modal.you_wont_see_mentions": "Non videbis nuntios quī eōs commemorant.",
   "navigation_bar.about": "De",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 3d0bfcb4be..e63c22ec69 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -418,7 +418,6 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# muevo elemento} other {# muevos elementos}}",
   "loading_indicator.label": "Eskargando…",
-  "media_gallery.toggle_visible": "{number, plural, one {Eskonde imaje} other {Eskonde imajes}}",
   "moved_to_account_banner.text": "Tu kuento {disabledAccount} esta aktualmente inkapasitado porke transferates a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Eskonde de avizos",
   "mute_modal.hide_options": "Eskonde opsyones",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 55ef2afce8..cc905e3a21 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Tavo sąrašai",
   "load_pending": "{count, plural, one {# naujas elementas} few {# nauji elementai} many {# naujo elemento} other {# naujų elementų}}",
   "loading_indicator.label": "Kraunama…",
-  "media_gallery.toggle_visible": "{number, plural, one {Slėpti vaizdą} few {Slėpti vaizdus} many {Slėpti vaizdo} other {Slėpti vaizdų}}",
+  "media_gallery.hide": "Slėpti",
   "moved_to_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta, nes persikėlei į {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Slėpti nuo pranešimų",
   "mute_modal.hide_options": "Slėpti parinktis",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 6cd15afbec..37dc1d06db 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -388,7 +388,6 @@
   "lists.subheading": "Tavi saraksti",
   "load_pending": "{count, plural, one {# jauna lieta} other {# jaunas lietas}}",
   "loading_indicator.label": "Ielādē…",
-  "media_gallery.toggle_visible": "{number, plural, one {Slēpt attēlu} other {Slēpt attēlus}}",
   "moved_to_account_banner.text": "Tavs konts {disabledAccount} pašlaik ir atspējots, jo Tu pārcēlies uz kontu {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Paslēpt paziņojumos",
   "mute_modal.hide_options": "Paslēpt iespējas",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 4a32b1d820..c6bc630bfe 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -383,7 +383,6 @@
   "lists.subheading": "Senarai anda",
   "load_pending": "{count, plural, one {# item baharu} other {# item baharu}}",
   "loading_indicator.label": "Memuatkan…",
-  "media_gallery.toggle_visible": "{number, plural, other {Sembunyikan imej}}",
   "moved_to_account_banner.text": "Akaun anda {disabledAccount} kini dinyahdayakan kerana anda berpindah ke {movedToAccount}.",
   "navigation_bar.about": "Perihal",
   "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index b042ebbcce..2127d69baa 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -362,7 +362,6 @@
   "lists.subheading": "သင့်၏စာရင်းများ",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "လုပ်ဆောင်နေသည်…",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "{movedToAccount} အကောင့်သို့ပြောင်းလဲထားသဖြင့် {disabledAccount} အကောင့်မှာပိတ်ထားသည်",
   "navigation_bar.about": "အကြောင်း",
   "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 7956435361..e5d8e8d2eb 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Jouw lijsten",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
   "loading_indicator.label": "Laden…",
-  "media_gallery.toggle_visible": "{number, plural, one {afbeelding verbergen} other {afbeeldingen verbergen}}",
+  "media_gallery.hide": "Verbergen",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
   "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
   "mute_modal.hide_options": "Opties verbergen",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 393946ff18..d21ebffe22 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Listene dine",
   "load_pending": "{count, plural, one {# nytt element} other {# nye element}}",
   "loading_indicator.label": "Lastar…",
-  "media_gallery.toggle_visible": "{number, plural, one {Skjul bilete} other {Skjul bilete}}",
+  "media_gallery.hide": "Gøym",
   "moved_to_account_banner.text": "Kontoen din, {disabledAccount} er for tida deaktivert fordi du har flytta til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ikkje vis varslingar",
   "mute_modal.hide_options": "Gøym val",
@@ -780,6 +780,7 @@
   "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
   "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
+  "status.continued_thread": "Framhald til tråden",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",
   "status.detailed_status": "Detaljert samtalevisning",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
+  "status.replied_in_thread": "Svara i tråden",
   "status.replied_to": "Svarte {name}",
   "status.reply": "Svar",
   "status.replyAll": "Svar til tråd",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index bb41754e7d..b805b98528 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Dine lister",
   "load_pending": "{count, plural,one {# ny gjenstand} other {# nye gjenstander}}",
   "loading_indicator.label": "Laster…",
-  "media_gallery.toggle_visible": "Veksle synlighet",
   "moved_to_account_banner.text": "Din konto {disabledAccount} er for øyeblikket deaktivert fordi du flyttet til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ikke varsle",
   "mute_modal.hide_options": "Skjul alternativer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index a4e552ba45..1d9008dbd1 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -319,7 +319,6 @@
   "lists.subheading": "Vòstras listas",
   "load_pending": "{count, plural, one {# nòu element} other {# nòu elements}}",
   "loading_indicator.label": "Cargament…",
-  "media_gallery.toggle_visible": "Modificar la visibilitat",
   "navigation_bar.about": "A prepaus",
   "navigation_bar.advanced_interface": "Dobrir l’interfàcia web avançada",
   "navigation_bar.blocks": "Personas blocadas",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 6bf6252d70..2ef437ef04 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Twoje listy",
   "load_pending": "{count, plural, one {# nowa pozycja} other {nowe pozycje}}",
   "loading_indicator.label": "Ładowanie…",
-  "media_gallery.toggle_visible": "Przełącz widoczność",
+  "media_gallery.hide": "Ukryj",
   "moved_to_account_banner.text": "Twoje konto {disabledAccount} jest obecnie wyłączone, ponieważ zostało przeniesione na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ukryj z powiadomień",
   "mute_modal.hide_options": "Ukryj opcje",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index aeff65485e..9978bf7644 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Suas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos items}}",
   "loading_indicator.label": "Carregando…",
-  "media_gallery.toggle_visible": "{number, plural, one {Ocultar mídia} other {Ocultar mídias}}",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Sua conta {disabledAccount} está desativada porque você a moveu para {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar das notificações",
   "mute_modal.hide_options": "Ocultar opções",
@@ -780,6 +780,7 @@
   "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Desfazer boost",
   "status.cannot_reblog": "Este toot não pode receber boost",
+  "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar link",
   "status.delete": "Excluir",
   "status.detailed_status": "Visão detalhada da conversa",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
   "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover do Salvos",
+  "status.replied_in_thread": "Respondido na discussão",
   "status.replied_to": "Em resposta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder a conversa",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index fd811d6833..24f5993112 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -444,7 +444,6 @@
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
   "loading_indicator.label": "A carregar…",
-  "media_gallery.toggle_visible": "Alternar visibilidade",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar das notificações",
   "mute_modal.hide_options": "Ocultar opções",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 5b1901fbe0..18380928b3 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -355,7 +355,6 @@
   "lists.search": "Caută printre persoanele la care ești abonat",
   "lists.subheading": "Listele tale",
   "load_pending": "{count, plural, one {# element nou} other {# elemente noi}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Ascunde imaginea} other {Ascunde imaginile}}",
   "moved_to_account_banner.text": "Contul tău {disabledAccount} este în acest moment dezactivat deoarece te-ai mutat la {movedToAccount}.",
   "navigation_bar.about": "Despre",
   "navigation_bar.advanced_interface": "Deschide în interfața web avansată",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 2c55da90b7..ab89743467 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -432,7 +432,6 @@
   "lists.subheading": "Ваши списки",
   "load_pending": "{count, plural, one {# новый элемент} few {# новых элемента} other {# новых элементов}}",
   "loading_indicator.label": "Загрузка…",
-  "media_gallery.toggle_visible": "Показать/скрыть {number, plural, =1 {изображение} other {изображения}}",
   "moved_to_account_banner.text": "Ваша учетная запись {disabledAccount} в настоящее время заморожена, потому что вы переехали на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Скрыть из уведомлений",
   "mute_modal.hide_options": "Скрыть параметры",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 6ca4eafe19..ac715e718e 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -319,7 +319,6 @@
   "lists.search": "त्वया अनुसारितजनेषु अन्विष्य",
   "lists.subheading": "तव सूचयः",
   "load_pending": "{count, plural, one {# नूतनवस्तु} other {# नूतनवस्तूनि}}",
-  "media_gallery.toggle_visible": "{number, plural, one {चित्रं प्रच्छादय} other {चित्राणि प्रच्छादय}}",
   "moved_to_account_banner.text": "तव एकौण्ट् {disabledAccount} अधुना निष्कृतो यतोहि {movedToAccount} अस्मिन्त्वमसार्षीः।",
   "navigation_bar.about": "विषये",
   "navigation_bar.blocks": "निषिद्धभोक्तारः",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 461383191e..0e055716e1 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -370,7 +370,6 @@
   "lists.subheading": "Is listas tuas",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende…",
-  "media_gallery.toggle_visible": "Cua {number, plural, one {immàgine} other {immàgines}}",
   "navigation_bar.about": "Informatziones",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index e8ae521ae5..b1b17b57db 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -304,7 +304,6 @@
   "lists.search": "Seirch amang the fowk ye ken",
   "lists.subheading": "Yer lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
   "moved_to_account_banner.text": "Yer accoont {disabledAccount} is disabilt the noo acause ye flittit tae {movedToAccount}.",
   "navigation_bar.about": "Aboot",
   "navigation_bar.blocks": "Dingied uisers",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 3d7c5416c9..f89e8cf5ab 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -420,7 +420,6 @@
   "lists.subheading": "Vaše zoznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položiek} other {# nových položiek}}",
   "loading_indicator.label": "Načítavanie…",
-  "media_gallery.toggle_visible": "{number, plural, one {Skryť obrázok} other {Skryť obrázky}}",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálne deaktivovaný, pretože ste sa presunuli na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ukryť z upozornení",
   "mute_modal.hide_options": "Skryť možnosti",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 6e8ac52df3..4e83b15089 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -437,7 +437,6 @@
   "lists.subheading": "Vaši seznami",
   "load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}",
   "loading_indicator.label": "Nalaganje …",
-  "media_gallery.toggle_visible": "{number, plural,one {Skrij sliko} two {Skrij sliki} other {Skrij slike}}",
   "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skrijte se pred obvestili",
   "mute_modal.hide_options": "Skrij možnosti",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 51b7a551c1..1904c186f7 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Listat tuaja",
   "load_pending": "{count, plural,one {# objekt i ri }other {# objekte të rinj }}",
   "loading_indicator.label": "Po ngarkohet…",
-  "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
+  "media_gallery.hide": "Fshihe",
   "moved_to_account_banner.text": "Llogaria juaj {disabledAccount} aktualisht është e çaktivizuar, ngaqë kaluat te {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Fshihe prej njoftimeve",
   "mute_modal.hide_options": "Fshihi mundësitë",
@@ -780,6 +780,7 @@
   "status.bookmark": "Faqeruaje",
   "status.cancel_reblog_private": "Shpërforcojeni",
   "status.cannot_reblog": "Ky postim s’mund të përforcohet",
+  "status.continued_thread": "Vazhdoi rrjedhën",
   "status.copy": "Kopjoje lidhjen për te mesazhi",
   "status.delete": "Fshije",
   "status.detailed_status": "Pamje e hollësishme bisede",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
   "status.remove_bookmark": "Hiqe faqerojtësin",
+  "status.replied_in_thread": "U përgjigj te rrjedha",
   "status.replied_to": "Iu përgjigj {name}",
   "status.reply": "Përgjigjuni",
   "status.replyAll": "Përgjigjuni rrjedhës",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index d550f6517c..02be70f5bf 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -424,7 +424,6 @@
   "lists.subheading": "Vaše liste",
   "load_pending": "{count, plural, one {# nova stavka} few {# nove stavke} other {# novih stavki}}",
   "loading_indicator.label": "Učitavanje…",
-  "media_gallery.toggle_visible": "{number, plural, one {Sakrij sliku} few {Sakrij slike} other {Sakrij slike}}",
   "moved_to_account_banner.text": "Vaš nalog {disabledAccount} je trenutno onemogućen jer ste prešli na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Sakrij iz obaveštenja",
   "mute_modal.hide_options": "Sakrij opcije",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index f608d46a20..dfd10579e6 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -424,7 +424,6 @@
   "lists.subheading": "Ваше листе",
   "load_pending": "{count, plural, one {# нова ставка} few {# нове ставке} other {# нових ставки}}",
   "loading_indicator.label": "Учитавање…",
-  "media_gallery.toggle_visible": "{number, plural, one {Сакриј слику} few {Сакриј слике} other {Сакриј слике}}",
   "moved_to_account_banner.text": "Ваш налог {disabledAccount} је тренутно онемогућен јер сте прешли на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Сакриј из обавештења",
   "mute_modal.hide_options": "Сакриј опције",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 76b46f3425..61cad916ca 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -454,7 +454,7 @@
   "lists.subheading": "Dina listor",
   "load_pending": "{count, plural, one {# nytt objekt} other {# nya objekt}}",
   "loading_indicator.label": "Laddar…",
-  "media_gallery.toggle_visible": "Växla synlighet",
+  "media_gallery.hide": "Dölj",
   "moved_to_account_banner.text": "Ditt konto {disabledAccount} är för närvarande inaktiverat eftersom du flyttat till {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Dölj från aviseringslistan",
   "mute_modal.hide_options": "Dölj alternativ",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 4bded45679..4f209b7e3e 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -252,7 +252,6 @@
   "lists.search": "நீங்கள் பின்தொடரும் நபர்கள் மத்தியில் தேடுதல்",
   "lists.subheading": "உங்கள் பட்டியல்கள்",
   "load_pending": "{count, plural,one {# புதியது}other {# புதியவை}}",
-  "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 52cb612d86..a6dc74b290 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -167,7 +167,6 @@
   "lists.new.title_placeholder": "కొత్త జాబితా శీర్షిక",
   "lists.search": "మీరు అనుసరించే వ్యక్తులలో శోధించండి",
   "lists.subheading": "మీ జాబితాలు",
-  "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 55f0fe02be..81424a9490 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -457,7 +457,6 @@
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด…",
-  "media_gallery.toggle_visible": "{number, plural, other {ซ่อนภาพ}}",
   "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
   "mute_modal.hide_from_notifications": "ซ่อนจากการแจ้งเตือน",
   "mute_modal.hide_options": "ซ่อนตัวเลือก",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 19e33233c0..0ca30c57da 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -270,7 +270,6 @@
   "lists.subheading": "kulupu lipu sina",
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
-  "media_gallery.toggle_visible": "{number, plural, other {o len e sitelen}}",
   "mute_modal.title": "sina wile ala wile kute e jan ni?",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan weka",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 4873fa943e..6577737bf1 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Listeleriniz",
   "load_pending": "{count, plural, one {# yeni öğe} other {# yeni öğe}}",
   "loading_indicator.label": "Yükleniyor…",
-  "media_gallery.toggle_visible": "{number, plural, one {Resmi} other {Resimleri}} gizle",
+  "media_gallery.hide": "Gizle",
   "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına taşıdığınız için şu an devre dışı.",
   "mute_modal.hide_from_notifications": "Bildirimlerde gizle",
   "mute_modal.hide_options": "Seçenekleri gizle",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index b63596037b..638a84b64f 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -457,7 +457,7 @@
   "lists.subheading": "Ваші списки",
   "load_pending": "{count, plural, one {# новий елемент} other {# нових елементів}}",
   "loading_indicator.label": "Завантаження…",
-  "media_gallery.toggle_visible": "{number, plural, one {Приховати зображення} other {Приховати зображення}}",
+  "media_gallery.hide": "Сховати",
   "moved_to_account_banner.text": "Ваш обліковий запис {disabledAccount} наразі вимкнений, оскільки вас перенесено до {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Сховати зі сповіщень",
   "mute_modal.hide_options": "Сховати опції",
@@ -780,7 +780,7 @@
   "status.bookmark": "Додати до закладок",
   "status.cancel_reblog_private": "Скасувати поширення",
   "status.cannot_reblog": "Цей допис не може бути поширений",
-  "status.continued_thread": "Continued thread",
+  "status.continued_thread": "Продовження у потоці",
   "status.copy": "Копіювати посилання на допис",
   "status.delete": "Видалити",
   "status.detailed_status": "Детальний вигляд бесіди",
@@ -814,6 +814,7 @@
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
   "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
+  "status.replied_in_thread": "Відповідь у потоці",
   "status.replied_to": "Відповідь для {name}",
   "status.reply": "Відповісти",
   "status.replyAll": "Відповісти на ланцюжок",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 048f8e7757..6dae368ffc 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -299,7 +299,6 @@
   "lists.search": "Siz kuzatadigan odamlar orasidan qidiring",
   "lists.subheading": "Sizning ro'yxatlaringiz",
   "load_pending": "{count, plural, one {# yangi element} other {# yangi elementlar}}",
-  "media_gallery.toggle_visible": "{number, plural, one {Rasmni yashirish} other {Rasmlarni yashirish}}",
   "moved_to_account_banner.text": "{movedToAccount} hisobiga koʻchganingiz uchun {disabledAccount} hisobingiz hozirda oʻchirib qoʻyilgan.",
   "navigation_bar.about": "Haqida",
   "navigation_bar.blocks": "Bloklangan foydalanuvchilar",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 80a766683a..09f288469d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -457,7 +457,6 @@
   "lists.subheading": "Danh sách của bạn",
   "load_pending": "{count, plural, one {# tút mới} other {# tút mới}}",
   "loading_indicator.label": "Đang tải…",
-  "media_gallery.toggle_visible": "{number, plural, other {Ẩn hình ảnh}}",
   "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ẩn thông báo",
   "mute_modal.hide_options": "Tùy chọn ẩn",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index d9367520e8..2fe63fe83c 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -118,7 +118,6 @@
   "lists.replies_policy.title": "ⵙⴽⵏ ⵜⵉⵔⴰⵔⵉⵏ ⵉ:",
   "lists.subheading": "ⵜⵉⵍⴳⴰⵎⵉⵏ ⵏⵏⴽ",
   "load_pending": "{count, plural, one {# ⵓⴼⵔⴷⵉⵙ ⴰⵎⴰⵢⵏⵓ} other {# ⵉⴼⵔⴷⴰⵙ ⵉⵎⴰⵢⵏⵓⵜⵏ}}",
-  "media_gallery.toggle_visible": "ⴼⴼⵔ {number, plural, one {ⵜⴰⵡⵍⴰⴼⵜ} other {ⵜⵉⵡⵍⴰⴼⵉⵏ}}",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.follow_requests": "ⵜⵓⵜⵔⴰⵡⵉⵏ ⵏ ⵓⴹⴼⴰⵕ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 94adc9af2d..9a6076f23f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -457,7 +457,7 @@
   "lists.subheading": "你的列表",
   "load_pending": "{count} 项",
   "loading_indicator.label": "加载中…",
-  "media_gallery.toggle_visible": "{number, plural, other {隐藏图像}}",
+  "media_gallery.hide": "隐藏",
   "moved_to_account_banner.text": "您的账号 {disabledAccount} 已禁用，因为您已迁移到 {movedToAccount}。",
   "mute_modal.hide_from_notifications": "从通知中隐藏",
   "mute_modal.hide_options": "隐藏选项",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 8543090b9a..2a55e6fc20 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -421,7 +421,6 @@
   "lists.subheading": "列表",
   "load_pending": "{count, plural, other {# 個新項目}}",
   "loading_indicator.label": "載入中…",
-  "media_gallery.toggle_visible": "隱藏圖片",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.hide_from_notifications": "隱藏通知",
   "mute_modal.hide_options": "隱藏選項",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index e671803573..cdc6c977b7 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -457,7 +457,7 @@
   "lists.subheading": "您的列表",
   "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
   "loading_indicator.label": "正在載入...",
-  "media_gallery.toggle_visible": "切換可見性",
+  "media_gallery.hide": "隱藏",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.hide_from_notifications": "於推播通知中隱藏",
   "mute_modal.hide_options": "隱藏選項",
diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml
index 021cc38b4f..9fa0f704b0 100644
--- a/config/locales/activerecord.ca.yml
+++ b/config/locales/activerecord.ca.yml
@@ -15,6 +15,12 @@ ca:
       user/invite_request:
         text: Motiu
     errors:
+      attributes:
+        domain:
+          invalid: no és un nom de domini vàlid
+      messages:
+        invalid_domain_on_line: "%{value} no és un nom de domini vàlid"
+        too_many_lines: sobrepassa el límit de %{limit} línies
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.da.yml b/config/locales/activerecord.da.yml
index fd94a6cf9a..35151f477d 100644
--- a/config/locales/activerecord.da.yml
+++ b/config/locales/activerecord.da.yml
@@ -15,6 +15,12 @@ da:
       user/invite_request:
         text: Årsag
     errors:
+      attributes:
+        domain:
+          invalid: er ikke et gyldigt domænenavn
+      messages:
+        invalid_domain_on_line: "%{value} er ikke et gyldigt domænenavn"
+        too_many_lines: overstiger grænsen på %{limit} linjer
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml
index ca590bec7d..b4bcd660d8 100644
--- a/config/locales/activerecord.de.yml
+++ b/config/locales/activerecord.de.yml
@@ -15,6 +15,12 @@ de:
       user/invite_request:
         text: Begründung
     errors:
+      attributes:
+        domain:
+          invalid: ist kein gültiger Domain-Name
+      messages:
+        invalid_domain_on_line: "%{value} ist kein gültiger Domain-Name"
+        too_many_lines: übersteigt das Limit von %{limit} Zeilen
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml
index 2b1cb05a6f..72edf5e02f 100644
--- a/config/locales/activerecord.en-GB.yml
+++ b/config/locales/activerecord.en-GB.yml
@@ -15,6 +15,12 @@ en-GB:
       user/invite_request:
         text: Reason
     errors:
+      attributes:
+        domain:
+          invalid: is not a valid domain name
+      messages:
+        invalid_domain_on_line: "%{value} is not a valid domain name"
+        too_many_lines: is over the limit of %{limit} lines
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fi.yml b/config/locales/activerecord.fi.yml
index 9da69b7dbd..b4d91a5f1e 100644
--- a/config/locales/activerecord.fi.yml
+++ b/config/locales/activerecord.fi.yml
@@ -15,6 +15,12 @@ fi:
       user/invite_request:
         text: Syy
     errors:
+      attributes:
+        domain:
+          invalid: ei ole kelvollinen verkkotunnus
+      messages:
+        invalid_domain_on_line: "%{value} ei ole kelvollinen verkkotunnus"
+        too_many_lines: ylittää %{limit} rivin rajan
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fo.yml b/config/locales/activerecord.fo.yml
index cf447a9dbc..61b924e5bf 100644
--- a/config/locales/activerecord.fo.yml
+++ b/config/locales/activerecord.fo.yml
@@ -15,6 +15,12 @@ fo:
       user/invite_request:
         text: Orsøk
     errors:
+      attributes:
+        domain:
+          invalid: er ikki eitt virkið økisnavn
+      messages:
+        invalid_domain_on_line: "%{value} er ikki eitt virkið økisnavn"
+        too_many_lines: er longri enn markið á %{limit} reglur
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.gl.yml b/config/locales/activerecord.gl.yml
index 477db570e7..961c96edb4 100644
--- a/config/locales/activerecord.gl.yml
+++ b/config/locales/activerecord.gl.yml
@@ -15,6 +15,12 @@ gl:
       user/invite_request:
         text: Razón
     errors:
+      attributes:
+        domain:
+          invalid: non é un nome de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} non é un nome de dominio válido"
+        too_many_lines: superou o límite de %{limit} liñas
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.he.yml b/config/locales/activerecord.he.yml
index 211d984863..1729084a4c 100644
--- a/config/locales/activerecord.he.yml
+++ b/config/locales/activerecord.he.yml
@@ -15,6 +15,12 @@ he:
       user/invite_request:
         text: סיבה
     errors:
+      attributes:
+        domain:
+          invalid: אינו שם מתחם קביל
+      messages:
+        invalid_domain_on_line: "%{value} אינו שם מתחם קביל"
+        too_many_lines: מעבר למגבלה של %{limit} שורות
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.hu.yml b/config/locales/activerecord.hu.yml
index f34ade0440..6e376dd678 100644
--- a/config/locales/activerecord.hu.yml
+++ b/config/locales/activerecord.hu.yml
@@ -15,6 +15,12 @@ hu:
       user/invite_request:
         text: Indoklás
     errors:
+      attributes:
+        domain:
+          invalid: nem egy érvényes domain név
+      messages:
+        invalid_domain_on_line: "%{value} nem egy érvényes domain név"
+        too_many_lines: túllépi a(z) %{limit} soros korlátot
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index bf1fbc67ef..bccfb96602 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -15,6 +15,11 @@ ia:
       user/invite_request:
         text: Motivo
     errors:
+      attributes:
+        domain:
+          invalid: non es un nomine de dominio valide
+      messages:
+        invalid_domain_on_line: "%{value} non es un nomine de dominio valide"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.is.yml b/config/locales/activerecord.is.yml
index 4423cb6e47..e274cc0a9e 100644
--- a/config/locales/activerecord.is.yml
+++ b/config/locales/activerecord.is.yml
@@ -15,6 +15,12 @@ is:
       user/invite_request:
         text: Ástæða
     errors:
+      attributes:
+        domain:
+          invalid: er ekki leyfilegt nafn á léni
+      messages:
+        invalid_domain_on_line: "%{value} er ekki leyfilegt nafn á léni"
+        too_many_lines: er yfir takmörkum á %{limit} línum
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml
index f23513e34c..3d5be6c258 100644
--- a/config/locales/activerecord.it.yml
+++ b/config/locales/activerecord.it.yml
@@ -15,6 +15,12 @@ it:
       user/invite_request:
         text: Motivo
     errors:
+      attributes:
+        domain:
+          invalid: non è un nome di dominio valido
+      messages:
+        invalid_domain_on_line: "%{value} non è un nome di dominio valido"
+        too_many_lines: è oltre il limite di %{limit} righe
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.lt.yml b/config/locales/activerecord.lt.yml
index cb6e21d8e8..2e4b54c626 100644
--- a/config/locales/activerecord.lt.yml
+++ b/config/locales/activerecord.lt.yml
@@ -15,6 +15,12 @@ lt:
       user/invite_request:
         text: Priežastis
     errors:
+      attributes:
+        domain:
+          invalid: nėra tinkamas domeno vardas.
+      messages:
+        invalid_domain_on_line: "%{value} nėra tinkamas domeno vardas."
+        too_many_lines: yra daugiau nei %{limit} eilučių ribojimą.
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml
index ce2c28a810..ee3c8bf260 100644
--- a/config/locales/activerecord.nl.yml
+++ b/config/locales/activerecord.nl.yml
@@ -15,6 +15,12 @@ nl:
       user/invite_request:
         text: Reden
     errors:
+      attributes:
+        domain:
+          invalid: is een ongeldige domeinnaam
+      messages:
+        invalid_domain_on_line: "%{value} is een ongeldige domeinnaam"
+        too_many_lines: overschrijdt de limiet van %{limit} regels
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.nn.yml b/config/locales/activerecord.nn.yml
index a303af6247..a34cc7cf12 100644
--- a/config/locales/activerecord.nn.yml
+++ b/config/locales/activerecord.nn.yml
@@ -15,6 +15,12 @@ nn:
       user/invite_request:
         text: Grunn
     errors:
+      attributes:
+        domain:
+          invalid: er ikkje eit gyldig domenenamn
+      messages:
+        invalid_domain_on_line: "%{value} er ikkje gyldig i eit domenenamn"
+        too_many_lines: er over grensa på %{limit} liner
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index 5ae1d3778a..d0e6dda58d 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -15,6 +15,12 @@ pl:
       user/invite_request:
         text: Powód
     errors:
+      attributes:
+        domain:
+          invalid: nie jest prawidłową nazwą domeny
+      messages:
+        invalid_domain_on_line: "%{value} nie jest prawidłową nazwą domeny"
+        too_many_lines: przekracza limit %{limit} linii
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.pt-BR.yml b/config/locales/activerecord.pt-BR.yml
index 3199eb8e2d..52f2b6ee87 100644
--- a/config/locales/activerecord.pt-BR.yml
+++ b/config/locales/activerecord.pt-BR.yml
@@ -15,6 +15,12 @@ pt-BR:
       user/invite_request:
         text: Razão
     errors:
+      attributes:
+        domain:
+          invalid: não é um nome de domínio válido
+      messages:
+        invalid_domain_on_line: "%{value} não é um nome de domínio válido"
+        too_many_lines: está acima do limite de %{limit} linhas
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.sv.yml b/config/locales/activerecord.sv.yml
index a3a45705ec..1679dae46e 100644
--- a/config/locales/activerecord.sv.yml
+++ b/config/locales/activerecord.sv.yml
@@ -15,6 +15,8 @@ sv:
       user/invite_request:
         text: Anledning
     errors:
+      messages:
+        invalid_domain_on_line: "%{value} Är inte ett giltigt domännamn"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.tr.yml b/config/locales/activerecord.tr.yml
index d2b79d256c..505289470e 100644
--- a/config/locales/activerecord.tr.yml
+++ b/config/locales/activerecord.tr.yml
@@ -15,6 +15,12 @@ tr:
       user/invite_request:
         text: Gerekçe
     errors:
+      attributes:
+        domain:
+          invalid: geçerli bir alan adı değil
+      messages:
+        invalid_domain_on_line: "%{value} geçerli bir alan adı değil"
+        too_many_lines: "%{limit} satır sınırının üzerinde"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.uk.yml b/config/locales/activerecord.uk.yml
index f16750acec..c9a4c8e1ec 100644
--- a/config/locales/activerecord.uk.yml
+++ b/config/locales/activerecord.uk.yml
@@ -15,6 +15,12 @@ uk:
       user/invite_request:
         text: Причина
     errors:
+      attributes:
+        domain:
+          invalid: не є дійсним іменем домену
+      messages:
+        invalid_domain_on_line: "%{value} не є дійсним іменем домену"
+        too_many_lines: перевищує ліміт %{limit} рядків
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index 1b661266ca..a4edf294a3 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -15,6 +15,12 @@ zh-CN:
       user/invite_request:
         text: 理由
     errors:
+      attributes:
+        domain:
+          invalid: 不是有效的域名
+      messages:
+        invalid_domain_on_line: "%{value} 不是有效的域名"
+        too_many_lines: 超出 %{limit} 行的长度限制
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml
index 24609332cd..7422550660 100644
--- a/config/locales/activerecord.zh-TW.yml
+++ b/config/locales/activerecord.zh-TW.yml
@@ -15,6 +15,12 @@ zh-TW:
       user/invite_request:
         text: 原因
     errors:
+      attributes:
+        domain:
+          invalid: 並非一個有效網域
+      messages:
+        invalid_domain_on_line: "%{value} 並非一個有效網域"
+        too_many_lines: 已超過行數限制 (%{limit} 行)
       models:
         account:
           attributes:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e1025563eb..63654ae708 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -435,6 +435,7 @@ ca:
       attempts_over_week:
         one: "%{count} intent en la darrera setmana"
         other: "%{count} intents de registre en la darrera setmana"
+      created_msg: S'ha blocat el domini de correu-e
       delete: Elimina
       dns:
         types:
@@ -444,8 +445,10 @@ ca:
         create: Afegir un domini
         resolve: Resol domini
         title: Blocar el nou domini de correu-e
+      no_email_domain_block_selected: No s'han canviat els bloqueigs de domini perquè no se n'ha seleccionat cap
       not_permitted: No permés
       resolved_through_html: Resolt mitjançant %{domain}
+      title: Dominis de correu-e blocats
     export_domain_allows:
       new:
         title: Importa dominis permesos
@@ -599,6 +602,7 @@ ca:
         resolve_description_html: No serà presa cap acció contra el compte denunciat, no se'n registrarà res i l'informe es tancarà.
         silence_description_html: El compte només serà visible a qui ja el seguia o l'ha cercat manualment, limitant-ne fortament l'abast. Sempre es pot revertir. Es tancaran tots els informes contra aquest compte.
         suspend_description_html: Aquest compte i tots els seus continguts seran inaccessibles i finalment eliminats, i interaccionar amb ell no serà possible. Reversible en 30 dies. Tanca tots els informes contra aquest compte.
+      actions_description_html: Decidiu quina acció a prendre per a resoldre aquest informe. Si preneu una acció punitiva contra el compte denunciat, se li enviarà una notificació per correu-e, excepte si se selecciona la categoria <strong>Spam</strong>.
       actions_description_remote_html: Decideix quina acció prendre per a resoldre aquest informe. Això només afectarà com <strong>el teu</strong> servidor es comunica amb aquest compte remot i en gestiona el contingut.
       actions_no_posts: Aquest informe no té associada cap publicació a esborrar
       add_to_report: Afegir més al informe
@@ -664,6 +668,7 @@ ca:
         delete_data_html: Esborra el perfil de <strong>@%{acct}</strong> i els seus continguts dins de 30 dies des d'ara a no ser que es desactivi la suspensió abans
         preview_preamble_html: "<strong>@%{acct}</strong> rebrà un avís amb el contingut següent:"
         record_strike_html: Registra una acció contra <strong>@%{acct}</strong> per ajudar a escalar-ho en futures violacions des d'aquest compte
+        send_email_html: Envia un avís per correu-e a <strong>@%{acct}</strong>
         warning_placeholder: Opcional raó adicional d'aquesta acció de moderació.
       target_origin: Origen del compte denunciat
       title: Informes
@@ -703,6 +708,7 @@ ca:
         manage_appeals: Gestiona apel·lacions
         manage_appeals_description: Permet als usuaris revisar les apel·lacions contra les accions de moderació
         manage_blocks: Gestiona blocs
+        manage_blocks_description: Permet als usuaris blocar adreces IP i proveïdors de correu-e
         manage_custom_emojis: Gestiona emojis personalitzats
         manage_custom_emojis_description: Permet als usuaris gestionar emojis personalitzats al servidor
         manage_federation: Gestiona federació
@@ -720,6 +726,7 @@ ca:
         manage_taxonomies: Gestionar taxonomies
         manage_taxonomies_description: Permet als usuaris revisar el contingut actual i actualitzar la configuració de l'etiqueta
         manage_user_access: Gestionar l'accés dels usuaris
+        manage_user_access_description: Permet als usuaris desactivar l'autenticació de dos factors d'altres usuaris, canviar la seva adreça de correu-e i restablir la seva contrasenya
         manage_users: Gestionar usuaris
         manage_users_description: Permet als usuaris veure els detalls d'altres usuaris i realitzar accions de moderació contra ells
         manage_webhooks: Gestionar Webhooks
@@ -1057,7 +1064,9 @@ ca:
       guide_link_text: Tothom hi pot contribuir.
     sensitive_content: Contingut sensible
   application_mailer:
+    notification_preferences: Canviar les preferències de correu-e
     salutation: "%{name},"
+    settings: 'Canviar les preferències de correu-e: %{link}'
     unsubscribe: Cancel·la la subscripció
     view: 'Visualització:'
     view_profile: Mostra el perfil
@@ -1077,6 +1086,7 @@ ca:
       hint_html: Una cosa més! Necessitem confirmar que ets una persona humana (és així com mantenim a ratlla l'spam). Resolt el CAPTCHA inferior i clica a "Segueix".
       title: Revisió de seguretat
     confirmations:
+      awaiting_review: S'ha confirmat la vostra adreça-e. El personal de %{domain} revisa ara el registre. Rebreu un correu si s'aprova el compte.
       awaiting_review_title: S'està revisant la teva inscripció
       clicking_this_link: en clicar aquest enllaç
       login_link: inici de sessió
@@ -1084,6 +1094,7 @@ ca:
       redirect_to_app_html: Se us hauria d'haver redirigit a l'app <strong>%{app_name}</strong>. Si això no ha passat, intenteu %{clicking_this_link} o torneu manualment a l'app.
       registration_complete: La teva inscripció a %{domain} ja és completa.
       welcome_title: Hola, %{name}!
+      wrong_email_hint: Si aquesta adreça de correu-e no és correcta, podeu canviar-la en els ajustos del compte.
     delete_account: Elimina el compte
     delete_account_html: Si vols suprimir el compte pots <a href="%{path}">fer-ho aquí</a>. Se't demanarà confirmació.
     description:
@@ -1126,6 +1137,7 @@ ca:
     security: Seguretat
     set_new_password: Estableix una contrasenya nova
     setup:
+      email_below_hint_html: Verifiqueu la carpeta de correu brossa o demaneu-ne un altre. Podeu corregir l'adreça de correu-e si no és correcta.
       email_settings_hint_html: Toca l'enllaç que t'hem enviat per a verificar %{email}. Esperarem aquí mateix.
       link_not_received: No has rebut l'enllaç?
       new_confirmation_instructions_sent: Rebràs un nou correu amb l'enllaç de confirmació en pocs minuts!
@@ -1139,12 +1151,19 @@ ca:
       title: Configurem-te a %{domain}.
     status:
       account_status: Estat del compte
+      confirming: Esperant que es completi la confirmació del correu-e.
       functional: El teu compte està completament operatiu.
       redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
       self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
       view_strikes: Veure accions del passat contra el teu compte
     too_fast: Formulari enviat massa ràpid, torna a provar-ho.
     use_security_key: Usa clau de seguretat
+  author_attribution:
+    example_title: Text d'exemple
+    hint_html: Controleu com se us acredita quan els enllaços es comparteixen a Mastodon.
+    more_from_html: Més de %{name}
+    s_blog: Blog de %{name}
+    title: Atribució d'autor
   challenge:
     confirm: Continua
     hint_html: "<strong>Pista:</strong> No et preguntarem un altre cop la teva contrasenya en la pròxima hora."
@@ -1930,6 +1949,7 @@ ca:
     instructions_html: Copieu i enganxeu el següent codi HTML al vostre lloc web. Després, afegiu l'adreça del vostre lloc web dins d'un dels camps extres del vostre perfil i deseu els canvis.
     verification: Verificació
     verified_links: Els teus enllaços verificats
+    website_verification: Verificació de web
   webauthn_credentials:
     add: Afegir nova clau de seguretat
     create:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 19ee9b9d81..731c1f0b40 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1161,6 +1161,12 @@ da:
       view_strikes: Se tidligere anmeldelser af din konto
     too_fast: Formularen indsendt for hurtigt, forsøg igen.
     use_security_key: Brug sikkerhedsnøgle
+  author_attribution:
+    example_title: Eksempeltekst
+    hint_html: Styrer, hvordan man krediteres, når links deles på Mastodon.
+    more_from_html: Flere fra %{name}
+    s_blog: "%{name}s blog"
+    title: Forfattertilskrivning
   challenge:
     confirm: Fortsæt
     hint_html: "<strong>Tip:</strong> Du bliver ikke anmodet om din adgangskode igen den næste time."
@@ -1949,6 +1955,7 @@ da:
     instructions_html: Kopier og indsæt koden nedenfor i HTML på din hjemmeside. Tilføj derefter adressen på din hjemmeside i et af de ekstra felter på din profil på fanen "Redigér profil" og gem ændringer.
     verification: Bekræftelse
     verified_links: Dine bekræftede links
+    website_verification: Webstedsbekræftelse
   webauthn_credentials:
     add: Tilføj ny sikkerhedsnøgle
     create:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b75aada764..cc049c5903 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -25,6 +25,7 @@ de:
   admin:
     account_actions:
       action: Aktion ausführen
+      already_silenced: Dieses Konto wurde bereits eingeschränkt.
       already_suspended: Dieses Konto wurde bereits gesperrt.
       title: "@%{acct} moderieren"
     account_moderation_notes:
@@ -1160,6 +1161,12 @@ de:
       view_strikes: Vorherige Verstöße deines Kontos ansehen
     too_fast: Formular zu schnell übermittelt. Bitte versuche es erneut.
     use_security_key: Sicherheitsschlüssel verwenden
+  author_attribution:
+    example_title: Beispieltext
+    hint_html: Bestimme, wie du Anerkennungen durch geteilte Links auf Mastodon handhaben möchtest.
+    more_from_html: Mehr von %{name}
+    s_blog: Blog von %{name}
+    title: Anerkennung als Autor*in
   challenge:
     confirm: Fortfahren
     hint_html: "<strong>Hinweis:</strong> Wir werden dich für die nächste Stunde nicht erneut nach deinem Passwort fragen."
@@ -1948,6 +1955,7 @@ de:
     instructions_html: Kopiere den unten stehenden Code und füge ihn in das HTML deiner Website ein. Trage anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil ein und speichere die Änderungen. Die Zusatzfelder befinden sich im Reiter „Profil bearbeiten“.
     verification: Verifizierung
     verified_links: Deine verifizierten Links
+    website_verification: Website-Verifizierung
   webauthn_credentials:
     add: Sicherheitsschlüssel hinzufügen
     create:
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index a3036c2f96..dc07dcff0b 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -25,6 +25,8 @@ en-GB:
   admin:
     account_actions:
       action: Perform action
+      already_silenced: This account has already been limited.
+      already_suspended: This account has already been suspended.
       title: Perform moderation action on %{acct}
     account_moderation_notes:
       create: Leave note
@@ -46,6 +48,7 @@ en-GB:
         title: Change email for %{username}
       change_role:
         changed_msg: Role successfully changed!
+        edit_roles: Manage user roles
         label: Change role
         no_role: No role
         title: Change role for %{username}
@@ -602,6 +605,7 @@ en-GB:
         suspend_description_html: The account and all its contents will be inaccessible and eventually deleted, and interacting with it will be impossible. Reversible within 30 days. Closes all reports against this account.
       actions_description_html: Decide which action to take to resolve this report. If you take a punitive action against the reported account, an email notification will be sent to them, except when the <strong>Spam</strong> category is selected.
       actions_description_remote_html: Decide which action to take to resolve this report. This will only affect how <strong>your</strong> server communicates with this remote account and handle its content.
+      actions_no_posts: This report doesn't have any associated posts to delete
       add_to_report: Add more to report
       already_suspended_badges:
         local: Already suspended on this server
@@ -723,6 +727,7 @@ en-GB:
         manage_taxonomies: Manage Taxonomies
         manage_taxonomies_description: Allows users to review trending content and update hashtag settings
         manage_user_access: Manage User Access
+        manage_user_access_description: Allows users to disable other users' two-factor authentication, change their email address, and reset their password
         manage_users: Manage Users
         manage_users_description: Allows users to view other users' details and perform moderation actions against them
         manage_webhooks: Manage Webhooks
@@ -797,6 +802,7 @@ en-GB:
       destroyed_msg: Site upload successfully deleted!
     software_updates:
       critical_update: Critical — please update quickly
+      description: It is recommended to keep your Mastodon installation up to date to benefit from the latest fixes and features. Moreover, it is sometimes critical to update Mastodon in a timely manner to avoid security issues. For these reasons, Mastodon checks for updates every 30 minutes, and will notify you according to your email notification preferences.
       documentation_link: Learn more
       release_notes: Release notes
       title: Available updates
@@ -883,16 +889,37 @@ en-GB:
         action: Check here for more information
         message_html: "<strong>Your object storage is misconfigured. The privacy of your users is at risk.</strong>"
     tags:
+      moderation:
+        not_trendable: Not trendable
+        not_usable: Not usable
+        pending_review: Pending review
+        review_requested: Review requested
+        reviewed: Reviewed
+        title: Status
+        trendable: Trendable
+        unreviewed: Unreviewed
+        usable: Usable
+      name: Name
+      newest: Newest
+      oldest: Oldest
+      open: View Publicly
+      reset: Reset
       review: Review status
+      search: Search
+      title: Hashtags
       updated_msg: Hashtag settings updated successfully
     title: Administration
     trends:
       allow: Allow
       approved: Approved
+      confirm_allow: Are you sure you want to allow selected tags?
+      confirm_disallow: Are you sure you want to disallow selected tags?
       disallow: Disallow
       links:
         allow: Allow link
         allow_provider: Allow publisher
+        confirm_allow: Are you sure you want to allow selected links?
+        confirm_allow_provider: Are you sure you want to allow selected providers?
         confirm_disallow: Are you sure you want to disallow selected links?
         confirm_disallow_provider: Are you sure you want to disallow selected providers?
         description_html: These are links that are currently being shared a lot by accounts that your server sees posts from. It can help your users find out what's going on in the world. No links are displayed publicly until you approve the publisher. You can also allow or reject individual links.
@@ -1039,7 +1066,9 @@ en-GB:
       guide_link_text: Everyone can contribute.
     sensitive_content: Sensitive content
   application_mailer:
+    notification_preferences: Change email preferences
     salutation: "%{name},"
+    settings: 'Change email preferences: %{link}'
     unsubscribe: Unsubscribe
     view: 'View:'
     view_profile: View profile
@@ -1059,6 +1088,7 @@ en-GB:
       hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
       title: Security check
     confirmations:
+      awaiting_review: Your email address is confirmed! The %{domain} staff is now reviewing your registration. You will receive an email if they approve your account!
       awaiting_review_title: Your registration is being reviewed
       clicking_this_link: clicking this link
       login_link: log in
@@ -1066,6 +1096,7 @@ en-GB:
       redirect_to_app_html: You should have been redirected to the <strong>%{app_name}</strong> app. If that did not happen, try %{clicking_this_link} or manually return to the app.
       registration_complete: Your registration on %{domain} is now complete!
       welcome_title: Welcome, %{name}!
+      wrong_email_hint: If that email address is not correct, you can change it in account settings.
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     description:
@@ -1086,6 +1117,7 @@ en-GB:
     or_log_in_with: Or log in with
     privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
     progress:
+      confirm: Confirm email
       details: Your details
       review: Our review
       rules: Accept rules
@@ -1107,6 +1139,7 @@ en-GB:
     security: Security
     set_new_password: Set new password
     setup:
+      email_below_hint_html: Check your spam folder, or request another one. You can correct your email address if it's wrong.
       email_settings_hint_html: Click the link we sent you to verify %{email}. We'll wait right here.
       link_not_received: Didn't get a link?
       new_confirmation_instructions_sent: You will receive a new email with the confirmation link in a few minutes!
@@ -1128,6 +1161,12 @@ en-GB:
       view_strikes: View past strikes against your account
     too_fast: Form submitted too fast, try again.
     use_security_key: Use security key
+  author_attribution:
+    example_title: Sample text
+    hint_html: Control how you're credited when links are shared on Mastodon.
+    more_from_html: More from %{name}
+    s_blog: "%{name}'s Blog"
+    title: Author attribution
   challenge:
     confirm: Continue
     hint_html: "<strong>Tip:</strong> We won't ask you for your password again for the next hour."
@@ -1423,6 +1462,7 @@ en-GB:
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a post that already contains images
+      not_found: Media %{ids} not found or already attached to another post
       not_ready: Cannot attach files that have not finished processing. Try again in a moment!
       too_many: Cannot attach more than 4 files
   migrations:
@@ -1915,6 +1955,7 @@ en-GB:
     instructions_html: Copy and paste the code below into the HTML of your website. Then add the address of your website into one of the extra fields on your profile from the "Edit profile" tab and save changes.
     verification: Verification
     verified_links: Your verified links
+    website_verification: Website verification
   webauthn_credentials:
     add: Add new security key
     create:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 90c1e77760..5c39346a9f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1161,6 +1161,10 @@ fi:
       view_strikes: Näytä aiemmat tiliäsi koskevat varoitukset
     too_fast: Lomake lähetettiin liian nopeasti, yritä uudelleen.
     use_security_key: Käytä suojausavainta
+  author_attribution:
+    example_title: Esimerkkiteksti
+    more_from_html: Lisää tekijältä %{name}
+    s_blog: Käyttäjän %{name} blogi
   challenge:
     confirm: Jatka
     hint_html: "<strong>Vihje:</strong> Emme pyydä sinulta salasanaa uudelleen seuraavan tunnin aikana."
@@ -1949,6 +1953,7 @@ fi:
     instructions_html: Kopioi ja liitä seuraava koodi verkkosivustosi HTML-lähdekoodiin. Lisää sitten verkkosivustosi osoite johonkin profiilisi lisäkentistä ”Muokkaa profiilia” -välilehdellä ja tallenna muutokset.
     verification: Vahvistus
     verified_links: Vahvistetut linkkisi
+    website_verification: Verkkosivuston vahvistus
   webauthn_credentials:
     add: Lisää uusi suojausavain
     create:
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 5bc192e9db..6d7b38e18a 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -25,6 +25,7 @@ fo:
   admin:
     account_actions:
       action: Frem atgerð
+      already_silenced: Hendan kontan er longu avmarkað.
       already_suspended: Hendan kontan er longu ógildað.
       title: Frem umsjónaratgerð á %{acct}
     account_moderation_notes:
@@ -1160,6 +1161,12 @@ fo:
       view_strikes: Vís eldri atsóknir móti tíni kontu
     too_fast: Oyðublaðið innsent ov skjótt, royn aftur.
     use_security_key: Brúka trygdarlykil
+  author_attribution:
+    example_title: Tekstadømi
+    hint_html: Kanna, hvussu tú verður viðurkend/ur, tá ið onnur deila slóðir á Mastodon.
+    more_from_html: Meiri frá %{name}
+    s_blog: Bloggurin hjá %{name}
+    title: Ískoyti høvundans
   challenge:
     confirm: Hald á
     hint_html: "<strong>Góð ráð:</strong> vit spyrja teg ikki aftur um loyniorðið næsta tíman."
@@ -1945,6 +1952,7 @@ fo:
     instructions_html: Avrita og innset koduna niðanfyri inn í HTML'ið á heimasíðuni hjá tær. Legg síðani adressuna á heimasíðuni hjá tær inn á eitt av eyka teigunum á vanganum hjá tær umvegis "Rætta vanga" teigin og goym broytingar.
     verification: Váttan
     verified_links: Tíni váttaðu leinki
+    website_verification: Heimasíðuváttan
   webauthn_credentials:
     add: Legg nýggjan trygdarlykil afturat
     create:
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c8fa1d833d..d275b844fd 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1161,6 +1161,12 @@ gl:
       view_strikes: Ver avisos anteriores respecto da túa conta
     too_fast: Formulario enviado demasiado rápido, inténtao outra vez.
     use_security_key: Usa chave de seguridade
+  author_attribution:
+    example_title: Texto de mostra
+    hint_html: Controla o xeito en que te acreditan cando se comparten ligazóns en Mastodon.
+    more_from_html: Máis de %{name}
+    s_blog: Blog de %{name}
+    title: Atribución da autoría
   challenge:
     confirm: Continuar
     hint_html: "<strong>Nota:</strong> Non che pediremos o contrasinal na seguinte hora."
@@ -1949,6 +1955,7 @@ gl:
     instructions_html: Copia e pega o código inferior no HTML do teu sitio web. Despois engade o enderezo da túa web nun dos campos de datos extra do teu perfil dispoñibles na lapela "Editar perfil" e garda os cambios.
     verification: Validación
     verified_links: As túas ligazóns verificadas
+    website_verification: Verificación do sitio web
   webauthn_credentials:
     add: Engadir nova chave de seguridade
     create:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 025b2de9e2..341e2bf023 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -29,6 +29,7 @@ he:
   admin:
     account_actions:
       action: בצע/י פעולה
+      already_silenced: חשבון זה הוגבל זה מכבר.
       already_suspended: חשבון זה הושעה.
       title: ביצוע פעולות הנהלה על %{acct}
     account_moderation_notes:
@@ -1196,6 +1197,12 @@ he:
       view_strikes: צפיה בעברות קודמות שנרשמו נגד חשבונך
     too_fast: הטופס הוגש מהר מדי, נסה/י שוב.
     use_security_key: שימוש במפתח אבטחה
+  author_attribution:
+    example_title: טקסט לדוגמה
+    hint_html: בחירה איך תקבלו קרדיטציה כאשר קישורים משותפים דרך מסטודון.
+    more_from_html: עוד מאת %{name}
+    s_blog: הבלוג של %{name}
+    title: ייחוס למפרסם
   challenge:
     confirm: המשך
     hint_html: "<strong>טיפ:</strong> לא נבקש את סיסמתך שוב בשעה הקרובה."
@@ -2014,6 +2021,7 @@ he:
     instructions_html: יש להדביק את הקוד שלמטה אל האתר שלך. ואז להוסיף את כתובת האתר לאחד השדות הנוספים בפרופיל מתוך טאב "עריכת פרופיל" ולשמור את השינויים.
     verification: אימות
     verified_links: קישוריך המאומתים
+    website_verification: אימות אתר רשת
   webauthn_credentials:
     add: הוספת מפתח אבטחה חדש
     create:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 141f5b7d07..e29472f8d8 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -25,6 +25,7 @@ hu:
   admin:
     account_actions:
       action: Művelet végrehajtása
+      already_silenced: Ezt a fiókot már korlátozták.
       already_suspended: Ezt a fiókot már felfüggesztették.
       title: 'Moderálási művelet végrehajtása ezen: %{acct}'
     account_moderation_notes:
@@ -1160,6 +1161,12 @@ hu:
       view_strikes: Fiókod ellen felrótt korábbi vétségek megtekintése
     too_fast: Túl gyorsan küldted el az űrlapot, próbáld később.
     use_security_key: Biztonsági kulcs használata
+  author_attribution:
+    example_title: Mintaszöveg
+    hint_html: Szabályozd, hogyan hivatkoznak rád, amikor linket osztanak meg Mastodonon.
+    more_from_html: 'Több tőle: %{name}'
+    s_blog: "%{name} blogja"
+    title: Szerző forrásmegjelölése
   challenge:
     confirm: Folytatás
     hint_html: "<strong>Hasznos:</strong> Nem fogjuk megint a jelszavadat kérdezni a következő órában."
@@ -1946,8 +1953,9 @@ hu:
     here_is_how: Itt van, hogyan kell
     hint_html: "<strong>A személyazonosságod ellenőrizhetősége a Mastodonon mindenki számára elérhető.</strong> Ez nyílt webes szabványok alapján, most és mindörökké szabadon és ingyenesen történik. Ehhez csak egy saját weboldalra van szükséged, mely alapján mások felismernek téged. Ha a profilodról erre a weboldalra hivatkozol, mi ellenőrizzük, hogy erről az oldalról visszahivatkozol-e a profilodra, és siker esetén erről vizuális jelzést is adunk a profilodon."
     instructions_html: Az alábbi kódot másold be a weboldalad HTML kódjába. Ezután add hozzá a weboldalad címét a profilod egyik extra mezőjéhez a "Profil szerkesztése" fülön és mentsd a változásokat.
-    verification: Hitelesítés
+    verification: Ellenőrzés
     verified_links: Ellenőrzött hivatkozásaid
+    website_verification: Weboldal ellenőrzése
   webauthn_credentials:
     add: Biztonsági kulcs hozzáadása
     create:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 073e5032b4..87789562fd 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -25,6 +25,7 @@ ia:
   admin:
     account_actions:
       action: Exequer action
+      already_silenced: Iste conto jam ha essite limitate.
       already_suspended: Iste conto jam ha essite suspendite.
       title: Exequer action de moderation sur %{acct}
     account_moderation_notes:
@@ -1146,6 +1147,10 @@ ia:
       view_strikes: Examinar le sanctiones passate contra tu conto
     too_fast: Formulario inviate troppo rapidemente. Tenta lo de novo.
     use_security_key: Usar clave de securitate
+  author_attribution:
+    example_title: Texto de exemplo
+    more_from_html: Plus de %{name}
+    s_blog: Blog de %{name}
   challenge:
     confirm: Continuar
     hint_html: "<strong>Consilio:</strong> Nos non te demandara tu contrasigno de novo in le proxime hora."
@@ -1933,6 +1938,7 @@ ia:
     instructions_html: Copia e colla le codice hic infra in le HTML de tu sito web. Alora adde le adresse de tu sito web in un del campos supplementari sur tu profilo desde le scheda “Modificar profilo” e salva le cambiamentos.
     verification: Verification
     verified_links: Tu ligamines verificate
+    website_verification: Verification de sito web
   webauthn_credentials:
     add: Adder un nove clave de securitate
     create:
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1c84c45c80..5fa147e8db 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -25,6 +25,7 @@ is:
   admin:
     account_actions:
       action: Framkvæma aðgerð
+      already_silenced: Þessi aðgangur hefur þegar verið takmarkaður.
       already_suspended: Þessi aðgangur hefur þegar verið settur í frysti.
       title: Framkvæma umsjónaraðgerð á %{acct}
     account_moderation_notes:
@@ -1164,6 +1165,12 @@ is:
       view_strikes: Skoða fyrri bönn notandaaðgangsins þíns
     too_fast: Innfyllingarform sent inn of hratt, prófaðu aftur.
     use_security_key: Nota öryggislykil
+  author_attribution:
+    example_title: Sýnitexti
+    hint_html: Stýrðu hvernig framlög þín birtast þegar tenglum er deilt á Mastodon.
+    more_from_html: Meira frá %{name}
+    s_blog: Bloggsvæði hjá %{name}
+    title: Framlag höfundar
   challenge:
     confirm: Halda áfram
     hint_html: "<strong>Ábending:</strong> Við munum ekki spyrja þig um lykilorðið aftur næstu klukkustundina."
@@ -1952,6 +1959,7 @@ is:
     instructions_html: Afritaðu og límdu kóðann hér fyrir neðan inn í HTML-kóða vefsvæðisins þíns. Bættu síðan slóð vefsvæðisins þíns inn í einn af auka-reitunum í flipanum "Breyta notandasniði" og vistaðu síðan breytingarnar.
     verification: Sannprófun
     verified_links: Staðfestu tenglarnir þínir
+    website_verification: Staðfesting vefsvæðis
   webauthn_credentials:
     add: Bæta við nýjum öryggislykli
     create:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a429c6339b..7de24fe259 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1163,6 +1163,12 @@ it:
       view_strikes: Visualizza le sanzioni precedenti prese nei confronti del tuo account
     too_fast: Modulo inviato troppo velocemente, riprova.
     use_security_key: Usa la chiave di sicurezza
+  author_attribution:
+    example_title: Testo di esempio
+    hint_html: Controlla come sei viene accreditato quando i link sono condivisi su Mastodon.
+    more_from_html: Altro da %{name}
+    s_blog: Blog di %{name}
+    title: Attribuzione autore
   challenge:
     confirm: Continua
     hint_html: "<strong>Suggerimento:</strong> Non ti chiederemo di nuovo la tua password per la prossima ora."
@@ -1951,6 +1957,7 @@ it:
     instructions_html: Copia e incolla il codice qui sotto nell'HTML del tuo sito web. Quindi, aggiungi l'indirizzo del tuo sito web in uno dei campi aggiuntivi del tuo profilo dalla scheda "Modifica profilo" e salva le modifiche.
     verification: Verifica
     verified_links: I tuoi collegamenti verificati
+    website_verification: Verifica del sito web
   webauthn_credentials:
     add: Aggiungi una nuova chiave di sicurezza
     create:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index c48b8ef93b..07e8ba75a2 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -29,6 +29,7 @@ lt:
   admin:
     account_actions:
       action: Atlikti veiksmą
+      already_silenced: Ši paskyra jau buvo apribota.
       already_suspended: Ši paskyra jau sustabdyta.
       title: Atlikti prižiūrėjimo veiksmą %{acct}
     account_moderation_notes:
@@ -800,6 +801,12 @@ lt:
       redirecting_to: Tavo paskyra yra neaktyvi, nes šiuo metu ji nukreipiama į %{acct}.
       self_destruct: Kadangi %{domain} uždaromas, turėsi tik ribotą prieigą prie savo paskyros.
       view_strikes: Peržiūrėti ankstesnius savo paskyros pažeidimus
+  author_attribution:
+    example_title: Teksto pavyzdys
+    hint_html: Valdyk, kaip esi nurodomas (-a), kai nuorodos bendrinamos platformoje „Mastodon“.
+    more_from_html: Daugiau iš %{name}
+    s_blog: "%{name} tinklaraštis"
+    title: Autoriaus (-ės) atribucija
   challenge:
     hint_html: "<strong>Patarimas:</strong> artimiausią valandą daugiau neprašysime tavo slaptažodžio."
   datetime:
@@ -1230,6 +1237,7 @@ lt:
     instructions_html: Nukopijuok ir įklijuok toliau pateiktą kodą į savo svetainės HTML. Tada į vieną iš papildomų profilio laukų skirtuke Redaguoti profilį įrašyk savo svetainės adresą ir išsaugok pakeitimus.
     verification: Patvirtinimas
     verified_links: Tavo patikrintos nuorodos
+    website_verification: Svetainės patvirtinimas
   webauthn_credentials:
     add: Pridėti naują saugumo raktą
     create:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c74bf488b5..63fcf1c857 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1161,6 +1161,12 @@ nl:
       view_strikes: Bekijk de eerder door moderatoren vastgestelde overtredingen die je hebt gemaakt
     too_fast: Formulier is te snel ingediend. Probeer het nogmaals.
     use_security_key: Beveiligingssleutel gebruiken
+  author_attribution:
+    example_title: Voorbeeldtekst
+    hint_html: Bepaal hoe we je vermelden, wanneer jouw links op Mastodon worden gedeeld.
+    more_from_html: Meer van %{name}
+    s_blog: De weblog van %{name}
+    title: Auteur-attributie
   challenge:
     confirm: Doorgaan
     hint_html: "<strong>Tip:</strong> We vragen jou het komende uur niet meer naar jouw wachtwoord."
@@ -1949,6 +1955,7 @@ nl:
     instructions_html: Kopieer en plak de onderstaande code in de HTML van je website. Voeg vervolgens het adres van je website toe aan een van de extra velden op je profiel op het tabblad "Profiel bewerken" en sla de wijzigingen op.
     verification: Verificatie
     verified_links: Jouw geverifieerde links
+    website_verification: Website-verificatie
   webauthn_credentials:
     add: Nieuwe beveiligingssleutel toevoegen
     create:
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 5c46a0d43e..47dcc1ac8e 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -26,6 +26,7 @@ nn:
     account_actions:
       action: Utfør
       already_silenced: Denne kontoen har allereie vorte avgrensa.
+      already_suspended: Denne kontoen er allereie sperra.
       title: Utfør moderatorhandling på %{acct}
     account_moderation_notes:
       create: Legg igjen merknad
@@ -47,6 +48,7 @@ nn:
         title: Byt e-post for %{username}
       change_role:
         changed_msg: Rolle endra!
+        edit_roles: Administrer brukarroller
         label: Endre rolle
         no_role: Inga rolle
         title: Endre rolle for %{username}
@@ -603,6 +605,7 @@ nn:
         suspend_description_html: Brukarkontoen og alt innhaldet vil bli utilgjengeleg og til slutt sletta, og det vil vera uråd å samhandla med brukaren. Du kan angra dette innan 30 dagar. Dette avsluttar alle rapportar om kontoen.
       actions_description_html: Avgjer kva som skal gjerast med denne rapporteringa. Dersom du utfører straffetiltak mot den rapporterte kontoen, vil dei motta ein e-post – så sant du ikkje har valt kategorien <strong>Spam</strong>.
       actions_description_remote_html: Avgjer kva du vil gjera for å løysa denne rapporten. Dette påverkar berre korleis tenaren <strong>din</strong> kommuniserer med kontoen på ein annan tenar, og korleis tenaren din handterer innhald derifrå.
+      actions_no_posts: Denne rapporten har ingen tilknytte innlegg å sletta
       add_to_report: Legg til i rapporten
       already_suspended_badges:
         local: Allereie utestengd på denne tenaren
@@ -1158,6 +1161,12 @@ nn:
       view_strikes: Vis tidligere advarsler mot kontoen din
     too_fast: Skjemaet ble sendt inn for raskt, prøv på nytt.
     use_security_key: Bruk sikkerhetsnøkkel
+  author_attribution:
+    example_title: Eksempeltekst
+    hint_html: Kontroller korleis du blir kreditert når nokon deler lenker på Mastodon.
+    more_from_html: Meir frå %{name}
+    s_blog: Bloggen til %{name}
+    title: Forfattarkreditering
   challenge:
     confirm: Hald fram
     hint_html: "<strong>Tips:</strong> Vi skal ikkje spørja deg om passordet ditt igjen i laupet av den neste timen."
@@ -1946,6 +1955,7 @@ nn:
     instructions_html: Kopier og lim inn i koden nedanfor i HTML-koden for nettsida di. Legg deretter adressa til nettsida di til i ei av ekstrafelta på profilen din frå fana "Rediger profil" og lagre endringane.
     verification: Stadfesting
     verified_links: Dine verifiserte lenker
+    website_verification: Stadfesting av nettside
   webauthn_credentials:
     add: Legg til ny sikkerhetsnøkkel
     create:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c90d448a7f..b710df2e78 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -29,6 +29,7 @@ pl:
   admin:
     account_actions:
       action: Wykonaj działanie
+      already_silenced: To konto zostało już ograniczone.
       already_suspended: To konto zostało już zawieszone.
       title: Wykonaj działanie moderacyjne na %{acct}
     account_moderation_notes:
@@ -1196,6 +1197,12 @@ pl:
       view_strikes: Zobacz dawne ostrzeżenia nałożone na twoje konto
     too_fast: Zbyt szybko przesłano formularz, spróbuj ponownie.
     use_security_key: Użyj klucza bezpieczeństwa
+  author_attribution:
+    example_title: Przykładowy tekst
+    hint_html: Kontroluj przypisy do twoich wpisów widoczne na Mastodonie.
+    more_from_html: Więcej od %{name}
+    s_blog: Blog %{name}
+    title: Przypis do autora
   challenge:
     confirm: Kontynuuj
     hint_html: "<strong>Informacja:</strong> Nie będziemy prosić Cię o ponowne podanie hasła przez następną godzinę."
@@ -2014,6 +2021,7 @@ pl:
     instructions_html: Skopiuj poniższy kod HTML i wklej go na swoją stronę. Potem dodaj link do twojej strony do jednego z wolnych pól na profilu z zakładki "Edytuj profil".
     verification: Weryfikacja
     verified_links: Twoje zweryfikowane linki
+    website_verification: Weryfikacja strony internetowej
   webauthn_credentials:
     add: Dodaj nowy klucz bezpieczeństwa
     create:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 3c14589e6c..864a8b4d91 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -25,6 +25,8 @@ pt-BR:
   admin:
     account_actions:
       action: Tomar uma atitude
+      already_silenced: Esta conta já foi limitada.
+      already_suspended: Esta conta já foi suspensa.
       title: Moderar %{acct}
     account_moderation_notes:
       create: Deixar nota
@@ -46,6 +48,7 @@ pt-BR:
         title: Alterar e-mail para %{username}
       change_role:
         changed_msg: Função alterada com sucesso!
+        edit_roles: Gerenciar funções do usuário
         label: Alterar função
         no_role: Nenhuma função
         title: Alterar função para %{username}
@@ -602,6 +605,7 @@ pt-BR:
         suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente, excluído e interagir com ela será impossível. Reversível dentro de 30 dias. Encerra todas as denúncias contra esta conta.
       actions_description_html: Decida qual ação tomar para responder a essa denúncia. Se você tomar uma ação punitiva contra a conta denunciada, uma notificação por e-mail será enviada ao usuário, exceto quando a categoria <strong>Spam</strong> for selecionada.
       actions_description_remote_html: Decida quais medidas tomará para resolver esta denúncia. Isso só afetará como <strong>seu servidor</strong> se comunica com esta conta remota e manipula seu conteúdo.
+      actions_no_posts: Essa denúncia não tem nenhuma publicação associada para excluir
       add_to_report: Adicionar mais à denúncia
       already_suspended_badges:
         local: Já suspenso neste servidor
@@ -1157,6 +1161,12 @@ pt-BR:
       view_strikes: Veja os avisos anteriores em relação à sua conta
     too_fast: O formulário foi enviado muito rapidamente, tente novamente.
     use_security_key: Usar chave de segurança
+  author_attribution:
+    example_title: Texto de amostra
+    hint_html: Controle como você é creditado quando links são compartilhados no Mastodon.
+    more_from_html: Mais de %{name}
+    s_blog: Blog do %{name}
+    title: Atribuição de autoria
   challenge:
     confirm: Continuar
     hint_html: "<strong>Dica:</strong> Não pediremos novamente sua senha pela próxima hora."
@@ -1945,6 +1955,7 @@ pt-BR:
     instructions_html: Copie o código abaixo e cole no HTML do seu site. Em seguida, adicione o endereço do seu site em um dos campos extras em seu perfil, na aba "Editar perfil", e salve as alterações.
     verification: Verificação
     verified_links: Seus links verificados
+    website_verification: Verificação do site
   webauthn_credentials:
     add: Adicionar nova chave de segurança
     create:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index c628bebaad..7b651470bf 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -3,6 +3,7 @@ ca:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protegeix de falses atribucions.
         discoverable: El teu perfil i els teus tuts públics poden aparèixer o ser recomanats en diverses àreas de Mastodon i el teu perfil pot ser suggerit a altres usuaris.
         display_name: El teu nom complet o el teu nom divertit.
         fields: La teva pàgina d'inici, pronoms, edat, el que vulguis.
@@ -143,6 +144,7 @@ ca:
         url: On els esdeveniments seran enviats
     labels:
       account:
+        attribution_domains_as_text: Permet només webs específics
         discoverable: Permet el perfil i el tuts en els algorismes de descobriment
         fields:
           name: Etiqueta
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 8bacdc46c3..e7b8fe337a 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -3,6 +3,7 @@ da:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Beskytter mod falske tilskrivninger.
         discoverable: Dine offentlige indlæg og profil kan blive fremhævet eller anbefalet i forskellige områder af Mastodon, og profilen kan blive foreslået til andre brugere.
         display_name: Dit fulde navn eller dit sjove navn.
         fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til.
@@ -143,6 +144,7 @@ da:
         url: Hvor begivenheder sendes til
     labels:
       account:
+        attribution_domains_as_text: Tillad kun bestemte websteder
         discoverable: Fremhæv profil og indlæg i opdagelsesalgoritmer
         fields:
           name: Etiket
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index ddb6621aa6..f7e55f1a7b 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -3,6 +3,7 @@ de:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Dadurch können falsche Zuschreibungen unterbunden werden.
         discoverable: Deine öffentlichen Beiträge und dein Profil können in verschiedenen Bereichen auf Mastodon angezeigt oder empfohlen werden und dein Profil kann anderen vorgeschlagen werden.
         display_name: Dein richtiger Name oder dein Fantasiename.
         fields: Deine Website, Pronomen, dein Alter – alles, was du möchtest.
@@ -143,6 +144,7 @@ de:
         url: Wohin Ereignisse gesendet werden
     labels:
       account:
+        attribution_domains_as_text: Nur ausgewählte Websites zulassen
         discoverable: Profil und Beiträge in Suchalgorithmen berücksichtigen
         fields:
           name: Beschriftung
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 18776d67d6..b802fd532f 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -3,6 +3,7 @@ en-GB:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protects from false attributions.
         discoverable: Your public posts and profile may be featured or recommended in various areas of Mastodon and your profile may be suggested to other users.
         display_name: Your full name or your fun name.
         fields: Your homepage, pronouns, age, anything you want.
@@ -130,6 +131,7 @@ en-GB:
         name: You can only change the casing of the letters, for example, to make it more readable
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
+        role: The role controls which permissions the user has.
       user_role:
         color: Color to be used for the role throughout the UI, as RGB in hex format
         highlighted: This makes the role publicly visible
@@ -142,6 +144,7 @@ en-GB:
         url: Where events will be sent to
     labels:
       account:
+        attribution_domains_as_text: Only allow specific websites
         discoverable: Feature profile and posts in discovery algorithms
         fields:
           name: Label
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index d3f0628631..a2b29566f6 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -143,6 +143,7 @@ fi:
         url: Mihin tapahtumat lähetetään
     labels:
       account:
+        attribution_domains_as_text: Salli vain tietyt verkkosivustot
         discoverable: Pidä profiiliasi ja julkaisujasi esillä löytämisalgoritmeissa
         fields:
           name: Nimike
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index 35e42f6c74..afcd3b39ac 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -3,6 +3,7 @@ fo:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Verjir fyri følskum ískoytum.
         discoverable: Tínir almennu postar og tín vangi kunnu vera drigin fram og viðmæld ymsa staðni í Mastodon og vangin hjá tær kann vera viðmæltur øðrum brúkarum.
         display_name: Títt fulla navn og títt stuttliga navn.
         fields: Heimasíðan hjá tær, fornøvn, aldur ella hvat tú vil.
@@ -143,6 +144,7 @@ fo:
         url: Hvar hendingar verða sendar til
     labels:
       account:
+        attribution_domains_as_text: Loyv einans ávísum heimasíðum
         discoverable: Framheva vanga og postar í uppdagingar-algoritmum
         fields:
           name: Spjaldur
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index abb30fa48c..cddeae5cee 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -3,6 +3,7 @@ gl:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protéxete de falsas atribucións.
         discoverable: As túas publicacións públicas e perfil poden mostrarse ou recomendarse en varias zonas de Mastodon e o teu perfil ser suxerido a outras usuarias.
         display_name: O teu nome completo ou un nome divertido.
         fields: Páxina web, pronome, idade, o que ti queiras.
@@ -143,6 +144,7 @@ gl:
         url: A onde se enviarán os eventos
     labels:
       account:
+        attribution_domains_as_text: Permitir só os sitios web indicados
         discoverable: Perfil destacado e publicacións nos algoritmos de descubrimento
         fields:
           name: Etiqueta
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 26edab3b2e..1feebb0d69 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -3,6 +3,7 @@ he:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: הגנה מייחוסים שקריים.
         discoverable: הפוסטים והפרופיל שלך עשויים להיות מוצגים או מומלצים באזורים שונים באתר וייתכן שהפרופיל שלך יוצע למשתמשים אחרים.
         display_name: שמך המלא או שם הכיף שלך.
         fields: עמוד הבית שלך, לשון הפנייה, גיל, וכל מידע אחר לפי העדפתך האישית.
@@ -143,6 +144,7 @@ he:
         url: היעד שאליו יישלחו אירועים
     labels:
       account:
+        attribution_domains_as_text: רק אתרים מסויימים יאושרו
         discoverable: הצג משתמש ופוסטים בעמוד התגליות
         fields:
           name: תווית
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 545fd4a8e9..383bdd0760 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -3,6 +3,7 @@ hu:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Megvéd a hamis forrásmegjelölésektől.
         discoverable: A nyilvános bejegyzéseid és a profilod kiemelhető vagy ajánlható a Mastodon különböző területein, a profilod más felhasználóknak is javasolható.
         display_name: Teljes neved vagy vicces neved.
         fields: Weboldalad, megszólításaid, korod, bármi, amit szeretnél.
@@ -143,6 +144,7 @@ hu:
         url: Ahová az eseményket küldjük
     labels:
       account:
+        attribution_domains_as_text: Csak meghatározott weboldalak engedélyezése
         discoverable: Profil és bejegyzések szerepeltetése a felfedezési algoritmusokban
         fields:
           name: Címke
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 85fa74f1ed..dc5aad57ae 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -142,6 +142,7 @@ ia:
         url: Ubi le eventos essera inviate
     labels:
       account:
+        attribution_domains_as_text: Solmente permitter sitos web specific
         discoverable: Evidentiar le profilo e messages in le algorithmos de discoperta
         fields:
           name: Etiquetta
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index d615e391ac..6f3a4fe8a5 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -3,6 +3,7 @@ is:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Ver fyrir fölskum tilvísunum í höfunda.
         discoverable: Opinberar færslur og notandasnið þitt geta birst eða verið mælt með á hinum ýmsu svæðum í Mastodon auk þess sem hægt er að mæla með þér við aðra notendur.
         display_name: Fullt nafn þitt eða eitthvað til gamans.
         fields: Heimasíðan þín, fornöfn, aldur eða eitthvað sem þú vilt koma á framfæri.
@@ -143,6 +144,7 @@ is:
         url: Hvert atburðir verða sendir
     labels:
       account:
+        attribution_domains_as_text: Einungis leyfa tiltekin vefsvæði
         discoverable: Hafa notandasnið og færslur með í reikniritum leitar
         fields:
           name: Skýring
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 1068b2f927..7ed4c0d004 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -3,6 +3,7 @@ it:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protegge da false attribuzioni.
         discoverable: I tuoi post pubblici e il tuo profilo potrebbero essere presenti o consigliati in varie aree di Mastodon e il tuo profilo potrebbe essere suggerito ad altri utenti.
         display_name: Il tuo nome completo o il tuo soprannome.
         fields: La tua homepage, i pronomi, l'età, tutto quello che vuoi.
@@ -143,6 +144,7 @@ it:
         url: Dove gli eventi saranno inviati
     labels:
       account:
+        attribution_domains_as_text: Consenti solo siti web specifici
         discoverable: Include il profilo e i post negli algoritmi di scoperta
         fields:
           name: Etichetta
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 99cb269e37..41f55f183d 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -3,6 +3,7 @@ lt:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Apsaugo nuo klaidingų atributų.
         discoverable: Tavo vieši įrašai ir profilis gali būti rodomi arba rekomenduojami įvairiose Mastodon vietose, o profilis gali būti siūlomas kitiems naudotojams.
         display_name: Tavo pilnas vardas arba smagus vardas.
         fields: Tavo pagrindinis puslapis, įvardžiai, amžius, bet kas, ko tik nori.
@@ -104,6 +105,7 @@ lt:
         role: Vaidmuo valdo, kokius leidimus naudotojas turi.
     labels:
       account:
+        attribution_domains_as_text: Leisti tik konkrečias svetaines
         discoverable: Rekomenduoti profilį ir įrašus į atradimo algoritmus
         indexable: Įtraukti viešus įrašus į paieškos rezultatus
         show_collections: Rodyti sekimus ir sekėjus profilyje
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 066f6c2acb..7f8aaa01d6 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -3,6 +3,7 @@ nl:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Beschermt tegen onjuiste attributies.
         discoverable: Jouw openbare berichten kunnen worden uitgelicht op verschillende plekken binnen Mastodon en jouw account kan worden aanbevolen aan andere gebruikers.
         display_name: Jouw volledige naam of een leuke bijnaam.
         fields: Jouw website, persoonlijke voornaamwoorden, leeftijd, alles wat je maar kwijt wilt.
@@ -143,6 +144,7 @@ nl:
         url: Waar gebeurtenissen naartoe worden verzonden
     labels:
       account:
+        attribution_domains_as_text: Alleen bepaalde websites toestaan
         discoverable: Jouw account en berichten laten uitlichten door Mastodon
         fields:
           name: Label
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 500a41c8cc..ddd5ed8995 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -3,6 +3,7 @@ nn:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Vernar mot falske krediteringar.
         discoverable: Dei offentlege innlegga dine og profilen din kan dukka opp i tilrådingar på ulike stader på Mastodon, og profilen din kan bli føreslegen for andre folk.
         display_name: Ditt fulle namn eller ditt tøysenamn.
         fields: Heimesida di, pronomen, alder, eller kva du måtte ynskje.
@@ -130,6 +131,7 @@ nn:
         name: Du kan berre endra bruken av store/små bokstavar, t. d. for å gjera det meir leseleg
       user:
         chosen_languages: Når merka vil berre tuta på dei valde språka synast på offentlege tidsliner
+        role: Rolla kontrollerer kva løyve brukaren har.
       user_role:
         color: Fargen som skal nyttast for denne rolla i heile brukargrensesnittet, som RGB i hex-format
         highlighted: Dette gjer rolla synleg offentleg
@@ -142,6 +144,7 @@ nn:
         url: Kvar hendingar skal sendast
     labels:
       account:
+        attribution_domains_as_text: Tillat berre visse nettstader
         discoverable: Ta med profilen og innlegga i oppdagingsalgoritmar
         fields:
           name: Merkelapp
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index b113e0eed5..bb404e56c9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -3,6 +3,7 @@ pl:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Chroni przed fałszywym przypisaniem wpisów.
         discoverable: Twój profil i publiczne wpisy mogą być promowane lub polecane na Mastodonie i twój profil może być sugerowany innym użytkownikom.
         display_name: Twoje imię lub pseudonim.
         fields: Co ci się tylko podoba – twoja strona domowa, zaimki, wiek…
@@ -143,6 +144,7 @@ pl:
         url: Dokąd będą wysłane zdarzenia
     labels:
       account:
+        attribution_domains_as_text: Zezwól tylko na konkretne strony
         discoverable: Udostępniaj profil i wpisy funkcjom odkrywania
         fields:
           name: Nazwa
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 6b0bad0f08..96bc219e8e 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -3,6 +3,7 @@ pt-BR:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protege de atribuições falsas.
         discoverable: Suas publicações e perfil públicos podem ser destaques ou recomendados em várias áreas de Mastodon, e seu perfil pode ser sugerido a outros usuários.
         display_name: Seu nome completo ou apelido.
         fields: Sua página inicial, pronomes, idade ou qualquer coisa que quiser.
@@ -130,6 +131,7 @@ pt-BR:
         name: Você pode mudar a capitalização das letras, por exemplo, para torná-la mais legível
       user:
         chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
+        role: A função controla quais permissões o usuário tem.
       user_role:
         color: Cor a ser usada para o cargo em toda a interface do usuário, como RGB no formato hexadecimal
         highlighted: Isso torna o cargo publicamente visível
@@ -142,6 +144,7 @@ pt-BR:
         url: Aonde os eventos serão enviados
     labels:
       account:
+        attribution_domains_as_text: Permitir apenas sites específicos
         discoverable: Destacar perfil e publicações nos algoritmos de descoberta
         fields:
           name: Rótulo
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 2fcf23b156..d90b97bf9b 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -3,6 +3,7 @@ tr:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Sahte atıflardan korur.
         discoverable: Herkese açık gönderileriniz ve profiliniz Mastodon'un çeşitli kısımlarında öne çıkarılabilir veya önerilebilir ve profiliniz başka kullanıcılara önerilebilir.
         display_name: Tam adınız veya kullanıcı adınız.
         fields: Ana sayfanız, zamirleriniz, yaşınız, istediğiniz herhangi bir şey.
@@ -143,6 +144,7 @@ tr:
         url: Olayların gönderileceği yer
     labels:
       account:
+        attribution_domains_as_text: Yalnızca belirli websitelerine izin ver
         discoverable: Profil ve gönderileri keşif algoritmalarında kullan
         fields:
           name: Etiket
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index e2a1562b53..b584a6cada 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -3,6 +3,7 @@ uk:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Захищає від фальшивих атрибутів.
         discoverable: Ваші дописи та профіль можуть бути рекомендовані в різних частинах Mastodon і ваш профіль може бути запропонований іншим користувачам.
         display_name: Ваше повне ім'я або ваш псевдонім.
         fields: Ваша домашня сторінка, займенники, вік, все, що вам заманеться.
@@ -143,6 +144,7 @@ uk:
         url: Куди надсилатимуться події
     labels:
       account:
+        attribution_domains_as_text: Дозволити лише на певних вебсайтах
         discoverable: Функції профілю та дописів у алгоритмах виявлення
         fields:
           name: Мітка
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index cb4341b551..419cb99abb 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -3,6 +3,7 @@ zh-CN:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: 保护作品免受虚假署名。
         discoverable: 您的公开嘟文和个人资料可能会在 Mastodon 的多个位置展示，您的个人资料可能会被推荐给其他用户。
         display_name: 你的全名或昵称。
         fields: 你的主页、人称代词、年龄，以及任何你想要添加的内容。
@@ -143,6 +144,7 @@ zh-CN:
         url: 事件将被发往的目的地
     labels:
       account:
+        attribution_domains_as_text: 仅允许特定网站
         discoverable: 在发现算法中展示你的个人资料和嘟文
         fields:
           name: 标签
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 8b4c440025..a5bc683634 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -3,6 +3,7 @@ zh-TW:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: 偽造署名保護。
         discoverable: 公開嘟文及個人檔案可能於各 Mastodon 功能中被推薦，並且您的個人檔案可能被推薦至其他使用者。
         display_name: 完整名稱或暱稱。
         fields: 烘培雞、自我認同代稱、年齡，及任何您想分享的。
@@ -143,6 +144,7 @@ zh-TW:
         url: 事件會被傳送至何處
     labels:
       account:
+        attribution_domains_as_text: 僅允許特定網站
         discoverable: 於探索演算法中推薦個人檔案及嘟文
         fields:
           name: 標籤
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 5e8a3c912c..dcc6ff7fb5 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -25,6 +25,7 @@ sq:
   admin:
     account_actions:
       action: Kryeje veprimin
+      already_silenced: Kjo llogari është kufizuar tashmë.
       already_suspended: Kjo llogari është pezulluar tashmë.
       title: Kryeni veprim moderimi te %{acct}
     account_moderation_notes:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0cc47ca92e..7b45f28c92 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -183,14 +183,17 @@ sv:
         create_custom_emoji: Skapa egen emoji
         create_domain_allow: Skapa tillåten domän
         create_domain_block: Skapa blockerad domän
+        create_email_domain_block: Skapa E-post domän block
         create_ip_block: Skapa IP-regel
         create_unavailable_domain: Skapa otillgänglig domän
         create_user_role: Skapa roll
         demote_user: Degradera användare
         destroy_announcement: Radera kungörelse
+        destroy_canonical_email_block: Ta bort e-post block
         destroy_custom_emoji: Radera egen emoji
         destroy_domain_allow: Ta bort tillåten domän
         destroy_domain_block: Ta bort blockerad domän
+        destroy_email_domain_block: Ta bort E-post domän block
         destroy_instance: Rensa domänen
         destroy_ip_block: Radera IP-regel
         destroy_status: Radera inlägg
@@ -233,6 +236,7 @@ sv:
         assigned_to_self_report_html: "%{name} tilldelade rapporten %{target} till sig själva"
         change_email_user_html: "%{name} bytte e-postadress för användaren %{target}"
         change_role_user_html: "%{name} ändrade roll för %{target}"
+        confirm_user_html: "%{name} bekräftad e-post adress av användare %{target}"
         create_account_warning_html: "%{name} skickade en varning till %{target}"
         create_announcement_html: "%{name} skapade kungörelsen %{target}"
         create_custom_emoji_html: "%{name} laddade upp ny emoji %{target}"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index d8f5eff6e8..785be3caf4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -25,7 +25,7 @@ tr:
   admin:
     account_actions:
       action: Eylemi gerçekleştir
-      already_silenced: Bu hesap zaten askıya alınmış.
+      already_silenced: Bu hesap zaten sınırlanmış.
       already_suspended: Bu hesap zaten askıya alınmış.
       title: "%{acct} üzerinde denetleme eylemi gerçekleştir"
     account_moderation_notes:
@@ -1161,6 +1161,12 @@ tr:
       view_strikes: Hesabınıza yönelik eski eylemleri görüntüleyin
     too_fast: Form çok hızlı gönderildi, tekrar deneyin.
     use_security_key: Güvenlik anahtarını kullan
+  author_attribution:
+    example_title: Örnek metin
+    hint_html: Mastodon'da bağlantılar paylaşıldığında nasıl tanınmak istediğinizi denetleyin.
+    more_from_html: "%{name} kişisinden daha fazlası"
+    s_blog: "%{name} kişisinin Günlüğü"
+    title: Yazar atıfı
   challenge:
     confirm: Devam et
     hint_html: "<strong>İpucu:</strong> Önümüzdeki saat boyunca sana parolanı sormayacağız."
@@ -1949,6 +1955,7 @@ tr:
     instructions_html: Aşağıdaki kodu kopyalayın ve websitenizin HTML'sine yapıştırın. Daha sonra "Profil Düzenle" sekmesini kullanarak profilinizdeki ek sahalardan birine websitenizin adresini ekleyin ve değişiklikleri kaydedin.
     verification: Doğrulama
     verified_links: Doğrulanmış bağlantılarınız
+    website_verification: Website doğrulama
   webauthn_credentials:
     add: Yeni güvenlik anahtarı ekle
     create:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 600239107e..f5cd40bad7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -29,6 +29,7 @@ uk:
   admin:
     account_actions:
       action: Виконати дію
+      already_silenced: Цей обліковий запис вже обмежено.
       already_suspended: Цей обліковий запис вже було призупинено.
       title: Здійснити модераційну дію над %{acct}
     account_moderation_notes:
@@ -1196,6 +1197,12 @@ uk:
       view_strikes: Переглянути попередні попередження вашому обліковому запису
     too_fast: Форму подано занадто швидко, спробуйте ще раз.
     use_security_key: Використовувати ключ безпеки
+  author_attribution:
+    example_title: Зразок тексту
+    hint_html: Контроль авторства поширених посилань на Mastodon.
+    more_from_html: Більше від %{name}
+    s_blog: Блог %{name}
+    title: Атрибути авторства
   challenge:
     confirm: Далі
     hint_html: "<strong>Підказка:</strong> ми не будемо запитувати ваш пароль впродовж наступної години."
@@ -2014,6 +2021,7 @@ uk:
     instructions_html: Скопіюйте та вставте наведений нижче код у HTML-код вашого сайту. Потім додайте адресу свого сайту в одне з додаткових полів вашого профілю на вкладці «Редагувати профіль» і збережіть зміни.
     verification: Підтвердження
     verified_links: Ваші підтверджені посилання
+    website_verification: Підтвердження вебсайтів
   webauthn_credentials:
     add: Додати новий ключ безпеки
     create:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index b97ab65f04..747dcf3738 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1143,6 +1143,12 @@ zh-CN:
       view_strikes: 查看针对你账号的记录
     too_fast: 表单提交过快，请重试。
     use_security_key: 使用安全密钥
+  author_attribution:
+    example_title: 示例文本
+    hint_html: 控制在 Mastodon 上分享的链接如何显示你的署名。
+    more_from_html: 来自 %{name} 的更多内容
+    s_blog: "%{name} 的博客"
+    title: 作者归属
   challenge:
     confirm: 继续
     hint_html: "<strong>注意：</strong>接下来一小时内我们不会再次要求你输入密码。"
@@ -1916,6 +1922,7 @@ zh-CN:
     instructions_html: 将下面的代码复制并粘贴到你网站的HTML中。然后在“编辑个人资料”选项卡中的附加字段之一添加你网站的地址，并保存更改。
     verification: 验证
     verified_links: 你已验证的链接
+    website_verification: 网站验证
   webauthn_credentials:
     add: 添加新的安全密钥
     create:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 052773e328..8eab176d7d 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1145,6 +1145,12 @@ zh-TW:
       view_strikes: 檢視針對您帳號過去的警示
     too_fast: 送出表單的速度太快跟不上，請稍後再試。
     use_security_key: 使用安全金鑰
+  author_attribution:
+    example_title: 範例文字
+    hint_html: 控制如何於 Mastodon 上分享連結時註明您的貢獻。
+    more_from_html: 來自 %{name} 之更多內容
+    s_blog: "%{name} 的部落格"
+    title: 作者署名
   challenge:
     confirm: 繼續
     hint_html: "<strong>温馨小提醒：</strong> 我們於接下來一小時內不會再要求您輸入密碼。"
@@ -1918,6 +1924,7 @@ zh-TW:
     instructions_html: 複製及貼上以下程式碼至您個人網站之 HTML 中。接著透過「編輯個人檔案」將您網站網址加入您個人網站之額外欄位中，並儲存變更。
     verification: 驗證連結
     verified_links: 已驗證連結
+    website_verification: 網站驗證
   webauthn_credentials:
     add: 新增安全金鑰
     create:

From a27f7f4e561c9d2fe21d984059603d2f500c005b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:59:46 +0200
Subject: [PATCH 21/89] Update typescript-eslint monorepo to v8 (major)
 (#31231)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
---
 .eslintrc.js                                  |   2 +-
 app/javascript/mastodon/actions/markers.ts    |   2 +-
 app/javascript/mastodon/actions/streaming.js  |   2 +-
 app/javascript/mastodon/common.js             |   2 +-
 .../mastodon/components/error_boundary.jsx    |   4 +-
 .../features/interaction_modal/index.jsx      |   2 +-
 app/javascript/mastodon/features/ui/index.jsx |   4 +-
 .../mastodon/locales/intl_provider.tsx        |   2 +-
 app/javascript/mastodon/settings.js           |   7 +-
 .../mastodon/store/middlewares/errors.ts      |   2 +-
 .../mastodon/store/middlewares/sounds.ts      |   2 +-
 package.json                                  |   4 +-
 yarn.lock                                     | 141 ++++++++++--------
 13 files changed, 99 insertions(+), 77 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d118262826..b6e4253e61 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -316,7 +316,7 @@ module.exports = defineConfig({
       ],
 
       parserOptions: {
-        project: true,
+        projectService: true,
         tsconfigRootDir: __dirname,
       },
 
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 521859f6c2..6254e3f083 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -65,7 +65,7 @@ export const synchronouslySubmitMarkers = createAppAsyncThunk(
       client.setRequestHeader('Content-Type', 'application/json');
       client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
       client.send(JSON.stringify(params));
-    } catch (e) {
+    } catch {
       // Do not make the BeforeUnload handler error out
     }
   },
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index bfdd894b81..03013110c3 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -151,7 +151,7 @@ async function refreshHomeTimelineAndNotification(dispatch, getState) {
     // TODO: polling for merged notifications
     try {
       await dispatch(pollRecentGroupNotifications());
-    } catch (error) {
+    } catch {
       // TODO
     }
   } else {
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 28857de534..c61e02250c 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -5,7 +5,7 @@ export function start() {
 
   try {
     Rails.start();
-  } catch (e) {
+  } catch {
     // If called twice
   }
 }
diff --git a/app/javascript/mastodon/components/error_boundary.jsx b/app/javascript/mastodon/components/error_boundary.jsx
index 7fea08e85f..392a3ad61e 100644
--- a/app/javascript/mastodon/components/error_boundary.jsx
+++ b/app/javascript/mastodon/components/error_boundary.jsx
@@ -60,8 +60,8 @@ export default class ErrorBoundary extends PureComponent {
     try {
       textarea.select();
       document.execCommand('copy');
-    } catch (e) {
-
+    } catch {
+      // do nothing
     } finally {
       document.body.removeChild(textarea);
     }
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 07f1e6fe5a..723e27ae1c 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -131,7 +131,7 @@ class LoginForm extends React.PureComponent {
     try {
       new URL(url);
       return true;
-    } catch(_) {
+    } catch {
       return false;
     }
   };
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 657c9e9e58..a6e3640478 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -319,8 +319,8 @@ class UI extends PureComponent {
 
     try {
       e.dataTransfer.dropEffect = 'copy';
-    } catch (err) {
-
+    } catch {
+      // do nothing
     }
 
     return false;
diff --git a/app/javascript/mastodon/locales/intl_provider.tsx b/app/javascript/mastodon/locales/intl_provider.tsx
index 68d4fcbd96..94372f95b0 100644
--- a/app/javascript/mastodon/locales/intl_provider.tsx
+++ b/app/javascript/mastodon/locales/intl_provider.tsx
@@ -17,7 +17,7 @@ function onProviderError(error: unknown) {
     error &&
     typeof error === 'object' &&
     error instanceof Error &&
-    error.message.match('MISSING_DATA')
+    /MISSING_DATA/.exec(error.message)
   ) {
     console.warn(error.message);
   }
diff --git a/app/javascript/mastodon/settings.js b/app/javascript/mastodon/settings.js
index f31aee0afc..f4883dc406 100644
--- a/app/javascript/mastodon/settings.js
+++ b/app/javascript/mastodon/settings.js
@@ -14,7 +14,7 @@ export default class Settings {
       const encodedData = JSON.stringify(data);
       localStorage.setItem(key, encodedData);
       return data;
-    } catch (e) {
+    } catch {
       return null;
     }
   }
@@ -24,7 +24,7 @@ export default class Settings {
     try {
       const rawData = localStorage.getItem(key);
       return JSON.parse(rawData);
-    } catch (e) {
+    } catch {
       return null;
     }
   }
@@ -35,7 +35,8 @@ export default class Settings {
       const key = this.generateKey(id);
       try {
         localStorage.removeItem(key);
-      } catch (e) {
+      } catch {
+        // ignore if the key is not found
       }
     }
     return data;
diff --git a/app/javascript/mastodon/store/middlewares/errors.ts b/app/javascript/mastodon/store/middlewares/errors.ts
index e77cec34ed..3ad3844d5b 100644
--- a/app/javascript/mastodon/store/middlewares/errors.ts
+++ b/app/javascript/mastodon/store/middlewares/errors.ts
@@ -30,7 +30,7 @@ function isActionWithmaybeAlertParams(
   return isAction(action);
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type -- we need to use `{}` here to ensure the dispatch types can be merged
 export const errorsMiddleware: Middleware<{}, RootState> =
   ({ dispatch }) =>
   (next) =>
diff --git a/app/javascript/mastodon/store/middlewares/sounds.ts b/app/javascript/mastodon/store/middlewares/sounds.ts
index 91407b1ec0..bb3a4aa474 100644
--- a/app/javascript/mastodon/store/middlewares/sounds.ts
+++ b/app/javascript/mastodon/store/middlewares/sounds.ts
@@ -51,7 +51,7 @@ const play = (audio: HTMLAudioElement) => {
 };
 
 export const soundsMiddleware = (): Middleware<
-  // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type -- we need to use `{}` here to ensure the dispatch types can be merged
   {},
   RootState
 > => {
diff --git a/package.json b/package.json
index ddf7ee75a2..ea0c0246cb 100644
--- a/package.json
+++ b/package.json
@@ -168,8 +168,8 @@
     "@types/requestidlecallback": "^0.3.5",
     "@types/webpack": "^4.41.33",
     "@types/webpack-env": "^1.18.4",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "babel-jest": "^29.5.0",
     "eslint": "^8.41.0",
     "eslint-define-config": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 90e764f49c..f498a5560e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -82,7 +82,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4, @babel/generator@npm:^7.7.2":
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
+  version: 7.25.0
+  resolution: "@babel/generator@npm:7.25.0"
+  dependencies:
+    "@babel/types": "npm:^7.25.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.25.4":
   version: 7.25.4
   resolution: "@babel/generator@npm:7.25.4"
   dependencies:
@@ -1521,7 +1533,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.25.2
+  resolution: "@babel/types@npm:7.25.2"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.24.8"
+    "@babel/helper-validator-identifier": "npm:^7.24.7"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.25.4":
   version: 7.25.4
   resolution: "@babel/types@npm:7.25.4"
   dependencies:
@@ -2791,8 +2814,8 @@ __metadata:
     "@types/requestidlecallback": "npm:^0.3.5"
     "@types/webpack": "npm:^4.41.33"
     "@types/webpack-env": "npm:^1.18.4"
-    "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
-    "@typescript-eslint/parser": "npm:^7.0.0"
+    "@typescript-eslint/eslint-plugin": "npm:^8.0.0"
+    "@typescript-eslint/parser": "npm:^8.0.0"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.5.0"
     axios: "npm:^1.4.0"
@@ -4114,44 +4137,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^7.0.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
+"@typescript-eslint/eslint-plugin@npm:^8.0.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.1.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:7.18.0"
-    "@typescript-eslint/type-utils": "npm:7.18.0"
-    "@typescript-eslint/utils": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+    "@typescript-eslint/scope-manager": "npm:8.1.0"
+    "@typescript-eslint/type-utils": "npm:8.1.0"
+    "@typescript-eslint/utils": "npm:8.1.0"
+    "@typescript-eslint/visitor-keys": "npm:8.1.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^7.0.0
-    eslint: ^8.56.0
+    "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
+    eslint: ^8.57.0 || ^9.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3
+  checksum: 10c0/7bbeae588f859b59c34d6a76cac06ef0fa605921b40c5d3b65b94829984280ea84c4dd3f5cb9ce2eb326f5563e9abb4c90ebff05c47f83f4def296c2ea1fa86c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^7.0.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/parser@npm:7.18.0"
+"@typescript-eslint/parser@npm:^8.0.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/parser@npm:8.1.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.18.0"
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/typescript-estree": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+    "@typescript-eslint/scope-manager": "npm:8.1.0"
+    "@typescript-eslint/types": "npm:8.1.0"
+    "@typescript-eslint/typescript-estree": "npm:8.1.0"
+    "@typescript-eslint/visitor-keys": "npm:8.1.0"
     debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^8.56.0
+    eslint: ^8.57.0 || ^9.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059
+  checksum: 10c0/b94b2d3ab5ca505484d100701fad6a04a5dc8d595029bac1b9f5b8a4a91d80fd605b0f65d230b36a97ab7e5d55eeb0c28af2ab63929a3e4ab8fdefd2a548c36b
   languageName: node
   linkType: hard
 
@@ -4165,30 +4188,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
+"@typescript-eslint/scope-manager@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.1.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
-  checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e
+    "@typescript-eslint/types": "npm:8.1.0"
+    "@typescript-eslint/visitor-keys": "npm:8.1.0"
+  checksum: 10c0/2bcf8cd176a1819bddcae16c572e7da8fba821b995a91cd53d64d8d6b85a17f5a895522f281ba57e34929574bddd4d6684ee3e545ec4e8096be4c3198e253a9a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/type-utils@npm:7.18.0"
+"@typescript-eslint/type-utils@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/type-utils@npm:8.1.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:7.18.0"
-    "@typescript-eslint/utils": "npm:7.18.0"
+    "@typescript-eslint/typescript-estree": "npm:8.1.0"
+    "@typescript-eslint/utils": "npm:8.1.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
-  peerDependencies:
-    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd
+  checksum: 10c0/62753941c4136e8d2daa72fe0410dea48e5317a6f12ece6382ca85e29912bd1b3f739b61d1060fc0a1f8c488dfc905beab4c8b8497951a21c3138a659c7271ec
   languageName: node
   linkType: hard
 
@@ -4199,10 +4220,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/types@npm:7.18.0"
-  checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054
+"@typescript-eslint/types@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/types@npm:8.1.0"
+  checksum: 10c0/ceade44455f45974e68956016c4d1c6626580732f7f9675e14ffa63db80b551752b0df596b20473dae9f0dc6ed966e17417dc2cf36e1a82b6ab0edc97c5eaa50
   languageName: node
   linkType: hard
 
@@ -4225,12 +4246,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
+"@typescript-eslint/typescript-estree@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.1.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:8.1.0"
+    "@typescript-eslint/visitor-keys": "npm:8.1.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -4240,21 +4261,21 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81
+  checksum: 10c0/a7bc8275df1c79c4cb14ef086c56674316dd4907efec53eddca35d0b5220428b69c82178ce2d95138da2e398269c8bd0764cae8020a36417e411e35c3c47bc4b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/utils@npm:7.18.0"
+"@typescript-eslint/utils@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/utils@npm:8.1.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:7.18.0"
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/typescript-estree": "npm:7.18.0"
+    "@typescript-eslint/scope-manager": "npm:8.1.0"
+    "@typescript-eslint/types": "npm:8.1.0"
+    "@typescript-eslint/typescript-estree": "npm:8.1.0"
   peerDependencies:
-    eslint: ^8.56.0
-  checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e
+    eslint: ^8.57.0 || ^9.0.0
+  checksum: 10c0/c95503a6bdcd98b1ff04d1adbf46377b2036b1c510d90a4a056401f996f775f06c3108c95fb81cd6babc9c97b73b91b8e848f0337bc508de8a49c993582f0e75
   languageName: node
   linkType: hard
 
@@ -4285,13 +4306,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.18.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
+"@typescript-eslint/visitor-keys@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.1.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:8.1.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0
+  checksum: 10c0/b7544dbb0eec1ddbfcd95c04b51b9a739c2e768c16d1c88508f976a2b0d1bc02fefb7491930e06e48073a5c07c6f488cd8403bba3a8b918888b93a88d5ac3869
   languageName: node
   linkType: hard
 

From e2c101ec35f54a8cf9a3310f4e563749b457cc6a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 9 Sep 2024 17:28:54 +0200
Subject: [PATCH 22/89] [Glitch] Change labels on thread indicators in web UI

Partial port of a021dee64214fcc662c0c36ad4e44dc1deaba65f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/status_prepend.jsx      | 12 +++--
 .../glitch/components/status_thread_label.tsx | 50 +++++++++++++++++++
 .../flavours/glitch/styles/components.scss    | 22 ++++++--
 3 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/status_thread_label.tsx

diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index 4756b36696..b83767a990 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -150,11 +150,13 @@ export default class StatusPrepend extends PureComponent {
 
     return !type ? null : (
       <aside className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend' : 'notification__message'}>
-        <Icon
-          className={`status__prepend-icon ${type === 'favourite' ? 'star-icon' : ''}`}
-          id={iconId}
-          icon={iconComponent}
-        />
+        <div className='status__prepend__icon'>
+          <Icon
+            className={type === 'favourite' ? 'star-icon' : null}
+            id={iconId}
+            icon={iconComponent}
+          />
+        </div>
         <Message />
         {children}
       </aside>
diff --git a/app/javascript/flavours/glitch/components/status_thread_label.tsx b/app/javascript/flavours/glitch/components/status_thread_label.tsx
new file mode 100644
index 0000000000..054156efaa
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/status_thread_label.tsx
@@ -0,0 +1,50 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { DisplayedName } from 'flavours/glitch/features/notifications_v2/components/displayed_name';
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const StatusThreadLabel: React.FC<{
+  accountId: string;
+  inReplyToAccountId: string;
+}> = ({ accountId, inReplyToAccountId }) => {
+  const inReplyToAccount = useAppSelector((state) =>
+    state.accounts.get(inReplyToAccountId),
+  );
+
+  let label;
+
+  if (accountId === inReplyToAccountId) {
+    label = (
+      <FormattedMessage
+        id='status.continued_thread'
+        defaultMessage='Continued thread'
+      />
+    );
+  } else if (inReplyToAccount) {
+    label = (
+      <FormattedMessage
+        id='status.replied_to'
+        defaultMessage='Replied to {name}'
+        values={{ name: <DisplayedName accountIds={[inReplyToAccountId]} /> }}
+      />
+    );
+  } else {
+    label = (
+      <FormattedMessage
+        id='status.replied_in_thread'
+        defaultMessage='Replied in thread'
+      />
+    );
+  }
+
+  return (
+    <div className='status__prepend'>
+      <div className='status__prepend__icon'>
+        <Icon id='reply' icon={ReplyIcon} />
+      </div>
+      {label}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 4ae330d0a5..51d87dbddf 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1776,15 +1776,29 @@ body > [data-popper-placement] {
 .status__prepend {
   padding: 8px 14px; // glitch: reduced padding
   padding-bottom: 0;
-  display: inline-flex;
-  gap: 10px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
   font-size: 14px;
   line-height: 22px;
   font-weight: 500;
   color: $dark-text-color;
 
-  .status__display-name strong {
-    color: $dark-text-color;
+  &__icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+
+    .icon {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
+  a {
+    color: inherit;
+    text-decoration: none;
   }
 
   > span {

From 7d53ca56d200dc0c3c8c6491d9e25aa8965e8d52 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 09:54:53 +0200
Subject: [PATCH 23/89] New Crowdin Translations (automated) (#31878)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cy.json    | 5 ++++-
 app/javascript/mastodon/locales/es-AR.json | 1 +
 config/locales/activerecord.cy.yml         | 6 ++++++
 config/locales/activerecord.es-AR.yml      | 6 ++++++
 config/locales/activerecord.sq.yml         | 6 ++++++
 config/locales/activerecord.sv.yml         | 4 ++++
 config/locales/cy.yml                      | 8 ++++++++
 config/locales/es-AR.yml                   | 7 +++++++
 config/locales/simple_form.cy.yml          | 2 ++
 config/locales/simple_form.es-AR.yml       | 2 ++
 config/locales/simple_form.sq.yml          | 2 ++
 config/locales/sq.yml                      | 7 +++++++
 config/locales/sv.yml                      | 9 +++++++++
 13 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d34b7a970d..7f058d8912 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -97,7 +97,7 @@
   "block_modal.title": "Blocio defnyddiwr?",
   "block_modal.you_wont_see_mentions": "Fyddwch chi ddim yn gweld postiadau sy'n sôn amdanyn nhw.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
-  "boost_modal.reblog": "Hybu postiad",
+  "boost_modal.reblog": "Hybu postiad?",
   "boost_modal.undo_reblog": "Dad-hybu postiad?",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
   "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
@@ -457,6 +457,7 @@
   "lists.subheading": "Eich rhestrau",
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Yn llwytho…",
+  "media_gallery.hide": "Cuddio",
   "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
   "mute_modal.hide_options": "Cuddio'r dewis",
@@ -779,6 +780,7 @@
   "status.bookmark": "Llyfrnodi",
   "status.cancel_reblog_private": "Dadhybu",
   "status.cannot_reblog": "Nid oes modd hybu'r postiad hwn",
+  "status.continued_thread": "Edefyn parhaus",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
@@ -812,6 +814,7 @@
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",
+  "status.replied_in_thread": "Atebodd mewn edefyn",
   "status.replied_to": "Wedi ateb {name}",
   "status.reply": "Ateb",
   "status.replyAll": "Ateb i edefyn",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index a0f91c4760..dfba0fe5d9 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# elemento nuevo} other {# elementos nuevos}}",
   "loading_indicator.label": "Cargando…",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te mudaste a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar en las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml
index 73b54d554e..0ad257db50 100644
--- a/config/locales/activerecord.cy.yml
+++ b/config/locales/activerecord.cy.yml
@@ -15,6 +15,12 @@ cy:
       user/invite_request:
         text: Rheswm
     errors:
+      attributes:
+        domain:
+          invalid: "- nid yw'n enw parth dilys"
+      messages:
+        invalid_domain_on_line: Nid yw %{value} yn enw parth dilys
+        too_many_lines: "- dros y terfyn o %{limit} llinell"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.es-AR.yml b/config/locales/activerecord.es-AR.yml
index 71b7f9732d..ba4d148c8b 100644
--- a/config/locales/activerecord.es-AR.yml
+++ b/config/locales/activerecord.es-AR.yml
@@ -15,6 +15,12 @@ es-AR:
       user/invite_request:
         text: Motivo
     errors:
+      attributes:
+        domain:
+          invalid: no es un nombre de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
+        too_many_lines: está por encima del límite de %{limit} líneas
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.sq.yml b/config/locales/activerecord.sq.yml
index 9c548bda04..888a17a1c8 100644
--- a/config/locales/activerecord.sq.yml
+++ b/config/locales/activerecord.sq.yml
@@ -15,6 +15,12 @@ sq:
       user/invite_request:
         text: Arsye
     errors:
+      attributes:
+        domain:
+          invalid: s’është emër i vlefshëm përkatësie
+      messages:
+        invalid_domain_on_line: "%{value} s’është emër i vlefshëm përkatësie"
+        too_many_lines: është tej kufirit prej %{limit} rreshta
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.sv.yml b/config/locales/activerecord.sv.yml
index 1679dae46e..6ac96d9ea9 100644
--- a/config/locales/activerecord.sv.yml
+++ b/config/locales/activerecord.sv.yml
@@ -15,8 +15,12 @@ sv:
       user/invite_request:
         text: Anledning
     errors:
+      attributes:
+        domain:
+          invalid: är inte ett giltigt domännamn
       messages:
         invalid_domain_on_line: "%{value} Är inte ett giltigt domännamn"
+        too_many_lines: överskrider gränsen på %{limit} rader
       models:
         account:
           attributes:
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index d317efad3f..2e425bb497 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -33,6 +33,7 @@ cy:
   admin:
     account_actions:
       action: Cyflawni gweithred
+      already_silenced: Mae'r cyfrif hwn eisoes wedi'i gyfyngu.
       already_suspended: Mae'r cyfrif hwn eisoes wedi'i atal.
       title: Cyflawni gweithred cymedroli ar %{acct}
     account_moderation_notes:
@@ -1232,6 +1233,12 @@ cy:
       view_strikes: Gweld rybuddion y gorffennol yn erbyn eich cyfrif
     too_fast: Cafodd y ffurflen ei chyflwyno'n rhy gyflym, ceisiwch eto.
     use_security_key: Defnyddiwch allwedd diogelwch
+  author_attribution:
+    example_title: Testun enghreifftiol
+    hint_html: Rheolwch sut rydych chi'n cael eich canmol pan fydd dolenni'n cael eu rhannu ar Mastodon.
+    more_from_html: Mwy gan %{name}
+    s_blog: Blog %{name}
+    title: Priodoliad awdur
   challenge:
     confirm: Parhau
     hint_html: "<strong>Awgrym:</strong> Fyddwn ni ddim yn gofyn i chi am eich cyfrinair eto am yr awr nesaf."
@@ -2080,6 +2087,7 @@ cy:
     instructions_html: Copïwch a gludo'r cod isod i HTML eich gwefan. Yna ychwanegwch gyfeiriad eich gwefan i un o'r meysydd ychwanegol ar eich proffil o'r tab "Golygu proffil" a chadw'r newidiadau.
     verification: Dilysu
     verified_links: Eich dolenni wedi'u dilysu
+    website_verification: Gwirio gwefan
   webauthn_credentials:
     add: Ychwanegu allwedd ddiogelwch newydd
     create:
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index f4d88d7323..63d2adc47c 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -1161,6 +1161,12 @@ es-AR:
       view_strikes: Ver incumplimientos pasados contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, probá de nuevo.
     use_security_key: Usar la llave de seguridad
+  author_attribution:
+    example_title: Texto de ejemplo
+    hint_html: Controlá cómo se te da crédito cuando los enlaces son compartidos en Mastodon.
+    more_from_html: Más de %{name}
+    s_blog: Blog de %{name}
+    title: Atribución del autor
   challenge:
     confirm: Continuar
     hint_html: "<strong>Dato:</strong> No volveremos a preguntarte por la contraseña durante la siguiente hora."
@@ -1949,6 +1955,7 @@ es-AR:
     instructions_html: Copiá y pegá el siguiente código en el HTML de tu sitio web. Luego, agregá la dirección de tu sitio web en uno de los campos extras de tu perfil desde la pestaña "Editar perfil" y guardá los cambios.
     verification: Verificación
     verified_links: Tus enlaces verificados
+    website_verification: Verificación del sitio web
   webauthn_credentials:
     add: Agregar nueva llave de seguridad
     create:
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 56586ecc96..56d1f873dc 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -3,6 +3,7 @@ cy:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Yn amddiffyn rhag priodoliadau ffug.
         discoverable: Mae'n bosibl y bydd eich postiadau cyhoeddus a'ch proffil yn cael sylw neu'n cael eu hargymell mewn gwahanol feysydd o Mastodon ac efallai y bydd eich proffil yn cael ei awgrymu i ddefnyddwyr eraill.
         display_name: Eich enw llawn neu'ch enw hwyl.
         fields: Eich tudalen cartref, rhagenwau, oed, neu unrhyw beth.
@@ -143,6 +144,7 @@ cy:
         url: I ble bydd digwyddiadau'n cael eu hanfon
     labels:
       account:
+        attribution_domains_as_text: Dim ond yn caniatáu gwefannau penodol
         discoverable: Proffil nodwedd a phostiadau mewn algorithmau darganfod
         fields:
           name: Label
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 70573c75f4..d06d09761a 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -3,6 +3,7 @@ es-AR:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protege de atribuciones falsas.
         discoverable: Tu perfil y publicaciones pueden ser destacadas o recomendadas en varias áreas de Mastodon, y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu pseudónimo.
         fields: Tu sitio web, pronombres, edad, o lo que quieras.
@@ -143,6 +144,7 @@ es-AR:
         url: Adónde serán enviados los eventos
     labels:
       account:
+        attribution_domains_as_text: Solo permitir sitios web específicos
         discoverable: Destacar perfil y mensajes en algoritmos de descubrimiento
         fields:
           name: Nombre de campo
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 3d86557282..169f4a02de 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -3,6 +3,7 @@ sq:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Mbron nga atribuime të rreme.
         discoverable: Postimet dhe profili juaj publik mund të shfaqen, ose rekomandohen në zona të ndryshme të Mastodon-it dhe profili juaj mund të sugjerohet përdoruesve të tjerë.
         display_name: Emri juaj i plotë, ose emri juaj lojcak.
         fields: Faqja juaj hyrëse, përemra, moshë, ç’të keni qejf.
@@ -143,6 +144,7 @@ sq:
         url: Ku do të dërgohen aktet
     labels:
       account:
+        attribution_domains_as_text: Lejo vetëm sajte specifikë
         discoverable: Profilin dhe postimet bëji objekt të algoritmeve të zbulimit
         fields:
           name: Etiketë
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index dcc6ff7fb5..241dc08b22 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1153,6 +1153,12 @@ sq:
       view_strikes: Shihni paralajmërime të dikurshme kundër llogarisë tuaj
     too_fast: Formulari u parashtrua shumë shpejt, riprovoni.
     use_security_key: Përdor kyç sigurie
+  author_attribution:
+    example_title: Tekst shembull
+    hint_html: Kontrolloni se si vlerësoheni, kur ndahen lidhje me të tjerë në Mastodon.
+    more_from_html: Më tepër nga %{name}
+    s_blog: Blogu i %{name}
+    title: Atribuim autorësh
   challenge:
     confirm: Vazhdo
     hint_html: "<strong>Ndihmëz:</strong> S’do t’ju pyesim për fjalëkalimin tuaj sërish, për një orë."
@@ -1941,6 +1947,7 @@ sq:
     instructions_html: Kopjoni dhe ngjitni në HTML-në e sajtit tuaj kodin më poshtë. Mandej shtoni adresën e sajtit tuaj te një nga fushat shtesë në profilin tuaj, që nga skeda “Përpunoni profil” dhe ruani ndryshimet.
     verification: Verifikim
     verified_links: Lidhjet tuaja të verifikuara
+    website_verification: Verifikim sajti
   webauthn_credentials:
     add: Shtoni kyç të ri sigurie
     create:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 7b45f28c92..c8ddc346a5 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -180,6 +180,7 @@ sv:
         confirm_user: Bekräfta användare
         create_account_warning: Skapa varning
         create_announcement: Skapa kungörelse
+        create_canonical_email_block: Skapa E-post block
         create_custom_emoji: Skapa egen emoji
         create_domain_allow: Skapa tillåten domän
         create_domain_block: Skapa blockerad domän
@@ -239,17 +240,21 @@ sv:
         confirm_user_html: "%{name} bekräftad e-post adress av användare %{target}"
         create_account_warning_html: "%{name} skickade en varning till %{target}"
         create_announcement_html: "%{name} skapade kungörelsen %{target}"
+        create_canonical_email_block_html: "%{name} blockade e-posten med %{target}"
         create_custom_emoji_html: "%{name} laddade upp ny emoji %{target}"
         create_domain_allow_html: "%{name} vitlistade domän %{target}"
         create_domain_block_html: "%{name} blockerade domänen %{target}"
+        create_email_domain_block_html: "%{name} blockerade e-post domänet%{target}"
         create_ip_block_html: "%{name} skapade regel för IP %{target}"
         create_unavailable_domain_html: "%{name} stoppade leverans till domänen %{target}"
         create_user_role_html: "%{name} skapade rollen %{target}"
         demote_user_html: "%{name} nedgraderade användare %{target}"
         destroy_announcement_html: "%{name} raderade kungörelsen %{target}"
+        destroy_canonical_email_block_html: "%{name} avblockerade e-post med hash%{target}"
         destroy_custom_emoji_html: "%{name} raderade emoji %{target}"
         destroy_domain_allow_html: "%{name} raderade domän %{target} från vitlistan"
         destroy_domain_block_html: "%{name} avblockerade domänen %{target}"
+        destroy_email_domain_block_html: "%{name} avblockerade e-post domänet %{target}"
         destroy_instance_html: "%{name} rensade domän %{target}"
         destroy_ip_block_html: "%{name} tog bort regel för IP %{target}"
         destroy_status_html: "%{name} tog bort inlägget av %{target}"
@@ -870,7 +875,9 @@ sv:
         message_html: "<strong>Din objektlagring är felkonfigurerad. Sekretessen för dina användare är i riskzonen.</strong>"
     tags:
       moderation:
+        reviewed: Granskat
         title: Status
+        trendable:
       name: Namn
       reset: Återställ
       review: Granskningsstatus
@@ -1112,6 +1119,8 @@ sv:
       view_strikes: Visa tidigare prickar på ditt konto
     too_fast: Formuläret har skickats för snabbt, försök igen.
     use_security_key: Använd säkerhetsnyckel
+  author_attribution:
+    example_title: Exempeltext
   challenge:
     confirm: Fortsätt
     hint_html: "<strong>Tips:</strong> Vi frågar dig inte efter ditt lösenord igen under nästkommande timme."

From f2a92c2d22345568ca7f47ee1d1d70de53eb547d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 10:16:07 +0200
Subject: [PATCH 24/89] Fix notifications re-rendering spuriously in web UI
 (#31879)

---
 .../components/notification_mention.tsx       |  4 ++-
 .../features/notifications_v2/index.tsx       |  3 ++-
 .../features/ui/containers/modal_container.js |  4 ++-
 .../ui/containers/notifications_container.js  | 19 +++-----------
 app/javascript/mastodon/selectors/index.js    | 25 ++++++++++++++-----
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
index 1929446bb2..d53cb37a83 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { isEqual } from 'lodash';
+
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
 import { me } from 'mastodon/initial_state';
@@ -47,7 +49,7 @@ export const NotificationMention: React.FC<{
       status.get('visibility') === 'direct',
       status.get('in_reply_to_account_id') === me,
     ] as const;
-  });
+  }, isEqual);
 
   let labelRenderer = mentionLabelRenderer;
 
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index 29c49e05c8..730d95bcd5 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -4,6 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
+import { isEqual } from 'lodash';
 import { useDebouncedCallback } from 'use-debounce';
 
 import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
@@ -62,7 +63,7 @@ export const Notifications: React.FC<{
   multiColumn?: boolean;
 }> = ({ columnId, multiColumn }) => {
   const intl = useIntl();
-  const notifications = useAppSelector(selectNotificationGroups);
+  const notifications = useAppSelector(selectNotificationGroups, isEqual);
   const dispatch = useAppDispatch();
   const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
   const hasMore = notifications.at(-1)?.type === 'gap';
diff --git a/app/javascript/mastodon/features/ui/containers/modal_container.js b/app/javascript/mastodon/features/ui/containers/modal_container.js
index 1c3872cd50..63c568f847 100644
--- a/app/javascript/mastodon/features/ui/containers/modal_container.js
+++ b/app/javascript/mastodon/features/ui/containers/modal_container.js
@@ -3,10 +3,12 @@ import { connect } from 'react-redux';
 import { openModal, closeModal } from '../../../actions/modal';
 import ModalRoot from '../components/modal_root';
 
+const defaultProps = {};
+
 const mapStateToProps = state => ({
   ignoreFocus: state.getIn(['modal', 'ignoreFocus']),
   type: state.getIn(['modal', 'stack', 0, 'modalType'], null),
-  props: state.getIn(['modal', 'stack', 0, 'modalProps'], {}),
+  props: state.getIn(['modal', 'stack', 0, 'modalProps'], defaultProps),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/mastodon/features/ui/containers/notifications_container.js b/app/javascript/mastodon/features/ui/containers/notifications_container.js
index 3d60cfdad1..b8aa9bc461 100644
--- a/app/javascript/mastodon/features/ui/containers/notifications_container.js
+++ b/app/javascript/mastodon/features/ui/containers/notifications_container.js
@@ -4,24 +4,11 @@ import { connect } from 'react-redux';
 
 import { NotificationStack } from 'react-notification';
 
-import { dismissAlert } from '../../../actions/alerts';
-import { getAlerts } from '../../../selectors';
-
-const formatIfNeeded = (intl, message, values) => {
-  if (typeof message === 'object') {
-    return intl.formatMessage(message, values);
-  }
-
-  return message;
-};
+import { dismissAlert } from 'mastodon/actions/alerts';
+import { getAlerts } from 'mastodon/selectors';
 
 const mapStateToProps = (state, { intl }) => ({
-  notifications: getAlerts(state).map(alert => ({
-    ...alert,
-    action: formatIfNeeded(intl, alert.action, alert.values),
-    title: formatIfNeeded(intl, alert.title, alert.values),
-    message: formatIfNeeded(intl, alert.message, alert.values),
-  })),
+  notifications: getAlerts(state, { intl }),
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index bd9b53919c..10e1b167ca 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -7,14 +7,16 @@ import { me } from '../initial_state';
 
 export { makeGetAccount } from "./accounts";
 
-const getFilters = (state, { contextType }) => {
-  if (!contextType) return null;
+const getFilters = createSelector([state => state.get('filters'), (_, { contextType }) => contextType], (filters, contextType) => {
+  if (!contextType) {
+    return null;
+  }
 
-  const serverSideType = toServerSideType(contextType);
   const now = new Date();
+  const serverSideType = toServerSideType(contextType);
 
-  return state.get('filters').filter((filter) => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
-};
+  return filters.filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
+});
 
 export const makeGetStatus = () => {
   return createSelector(
@@ -73,10 +75,21 @@ const ALERT_DEFAULTS = {
   style: false,
 };
 
-export const getAlerts = createSelector(state => state.get('alerts'), alerts =>
+const formatIfNeeded = (intl, message, values) => {
+  if (typeof message === 'object') {
+    return intl.formatMessage(message, values);
+  }
+
+  return message;
+};
+
+export const getAlerts = createSelector([state => state.get('alerts'), (_, { intl }) => intl], (alerts, intl) =>
   alerts.map(item => ({
     ...ALERT_DEFAULTS,
     ...item,
+    action: formatIfNeeded(intl, item.action, item.values),
+    title: formatIfNeeded(intl, item.title, item.values),
+    message: formatIfNeeded(intl, item.message, item.values),
   })).toArray());
 
 export const makeGetNotification = () => createSelector([

From 3d46f478174403a64bd194e8c60e11b07bbd5d2d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 11:41:19 +0200
Subject: [PATCH 25/89] Change embedded posts to use web UI (#31766)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 app/helpers/accounts_helper.rb                |   8 -
 app/helpers/media_component_helper.rb         |  36 --
 app/javascript/entrypoints/embed.tsx          |  74 ++++
 app/javascript/entrypoints/public.tsx         |  37 --
 app/javascript/hooks/useRenderSignal.ts       |  32 ++
 app/javascript/mastodon/actions/statuses.js   |   6 +-
 app/javascript/mastodon/components/logo.tsx   |   7 +
 .../mastodon/components/more_from_author.jsx  |   6 +-
 .../features/standalone/status/index.tsx      |  87 ++++
 .../status/components/detailed_status.jsx     | 322 ---------------
 .../status/components/detailed_status.tsx     | 390 ++++++++++++++++++
 .../containers/detailed_status_container.js   | 140 -------
 .../mastodon/features/status/index.jsx        |   2 +-
 app/javascript/styles/application.scss        |   1 -
 .../styles/mastodon/components.scss           |  31 +-
 app/javascript/styles/mastodon/statuses.scss  | 152 -------
 app/serializers/oembed_serializer.rb          |  20 +-
 app/views/layouts/embedded.html.haml          |   2 +-
 app/views/statuses/_detailed_status.html.haml |  80 ----
 app/views/statuses/_poll.html.haml            |  36 --
 app/views/statuses/_simple_status.html.haml   |  70 ----
 app/views/statuses/_status.html.haml          |   2 -
 app/views/statuses/embed.html.haml            |   3 +-
 config/locales/af.yml                         |   1 -
 config/locales/an.yml                         |  12 -
 config/locales/ar.yml                         |  20 -
 config/locales/ast.yml                        |   9 -
 config/locales/be.yml                         |  16 -
 config/locales/bg.yml                         |  12 -
 config/locales/bn.yml                         |   1 -
 config/locales/br.yml                         |   4 -
 config/locales/ca.yml                         |  12 -
 config/locales/ckb.yml                        |  12 -
 config/locales/co.yml                         |  12 -
 config/locales/cs.yml                         |  16 -
 config/locales/cy.yml                         |  20 -
 config/locales/da.yml                         |  12 -
 config/locales/de.yml                         |  12 -
 config/locales/el.yml                         |  12 -
 config/locales/en-GB.yml                      |  12 -
 config/locales/en.yml                         |  12 -
 config/locales/eo.yml                         |  12 -
 config/locales/es-AR.yml                      |  12 -
 config/locales/es-MX.yml                      |  12 -
 config/locales/es.yml                         |  12 -
 config/locales/et.yml                         |  12 -
 config/locales/eu.yml                         |  12 -
 config/locales/fa.yml                         |  12 -
 config/locales/fi.yml                         |  12 -
 config/locales/fo.yml                         |  12 -
 config/locales/fr-CA.yml                      |  12 -
 config/locales/fr.yml                         |  12 -
 config/locales/fy.yml                         |  12 -
 config/locales/ga.yml                         |  18 -
 config/locales/gd.yml                         |  16 -
 config/locales/gl.yml                         |  12 -
 config/locales/he.yml                         |  16 -
 config/locales/hi.yml                         |   1 -
 config/locales/hr.yml                         |  14 -
 config/locales/hu.yml                         |  12 -
 config/locales/hy.yml                         |  12 -
 config/locales/ia.yml                         |  12 -
 config/locales/id.yml                         |  10 -
 config/locales/ie.yml                         |  12 -
 config/locales/io.yml                         |  12 -
 config/locales/is.yml                         |  12 -
 config/locales/it.yml                         |  12 -
 config/locales/ja.yml                         |  10 -
 config/locales/ka.yml                         |   3 -
 config/locales/kab.yml                        |  12 -
 config/locales/kk.yml                         |  12 -
 config/locales/ko.yml                         |  10 -
 config/locales/ku.yml                         |  12 -
 config/locales/la.yml                         |   1 -
 config/locales/lad.yml                        |  12 -
 config/locales/lt.yml                         |   6 -
 config/locales/lv.yml                         |  14 -
 config/locales/ml.yml                         |   1 -
 config/locales/ms.yml                         |  10 -
 config/locales/my.yml                         |  10 -
 config/locales/nl.yml                         |  12 -
 config/locales/nn.yml                         |  12 -
 config/locales/no.yml                         |  12 -
 config/locales/oc.yml                         |  12 -
 config/locales/pa.yml                         |   1 -
 config/locales/pl.yml                         |  16 -
 config/locales/pt-BR.yml                      |  12 -
 config/locales/pt-PT.yml                      |  12 -
 config/locales/ro.yml                         |  14 -
 config/locales/ru.yml                         |  16 -
 config/locales/ry.yml                         |   1 -
 config/locales/sc.yml                         |  12 -
 config/locales/sco.yml                        |  12 -
 config/locales/si.yml                         |  12 -
 config/locales/sk.yml                         |  16 -
 config/locales/sl.yml                         |  16 -
 config/locales/sq.yml                         |  12 -
 config/locales/sr-Latn.yml                    |  14 -
 config/locales/sr.yml                         |  14 -
 config/locales/sv.yml                         |  12 -
 config/locales/ta.yml                         |   2 -
 config/locales/te.yml                         |   1 -
 config/locales/th.yml                         |  10 -
 config/locales/tr.yml                         |  12 -
 config/locales/tt.yml                         |   7 -
 config/locales/uk.yml                         |  16 -
 config/locales/uz.yml                         |   2 -
 config/locales/vi.yml                         |  10 -
 config/locales/zgh.yml                        |   1 -
 config/locales/zh-CN.yml                      |  10 -
 config/locales/zh-HK.yml                      |  10 -
 config/locales/zh-TW.yml                      |  10 -
 public/embed.js                               | 105 +++--
 spec/controllers/statuses_controller_spec.rb  |   1 -
 spec/helpers/media_component_helper_spec.rb   |  22 -
 115 files changed, 710 insertions(+), 1928 deletions(-)
 create mode 100644 app/javascript/entrypoints/embed.tsx
 create mode 100644 app/javascript/hooks/useRenderSignal.ts
 create mode 100644 app/javascript/mastodon/features/standalone/status/index.tsx
 delete mode 100644 app/javascript/mastodon/features/status/components/detailed_status.jsx
 create mode 100644 app/javascript/mastodon/features/status/components/detailed_status.tsx
 delete mode 100644 app/javascript/mastodon/features/status/containers/detailed_status_container.js
 delete mode 100644 app/javascript/styles/mastodon/statuses.scss
 delete mode 100644 app/views/statuses/_detailed_status.html.haml
 delete mode 100644 app/views/statuses/_poll.html.haml
 delete mode 100644 app/views/statuses/_simple_status.html.haml
 delete mode 100644 app/views/statuses/_status.html.haml

diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 158a0815e1..d804566c93 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -19,14 +19,6 @@ module AccountsHelper
     end
   end
 
-  def account_action_button(account)
-    return if account.memorial? || account.moved?
-
-    link_to ActivityPub::TagManager.instance.url_for(account), class: 'button logo-button', target: '_new' do
-      safe_join([logo_as_symbol, t('accounts.follow')])
-    end
-  end
-
   def account_formatted_stat(value)
     number_to_human(value, precision: 3, strip_insignificant_zeros: true)
   end
diff --git a/app/helpers/media_component_helper.rb b/app/helpers/media_component_helper.rb
index fa8f34fb4d..60ccdd0835 100644
--- a/app/helpers/media_component_helper.rb
+++ b/app/helpers/media_component_helper.rb
@@ -57,26 +57,6 @@ module MediaComponentHelper
     end
   end
 
-  def render_card_component(status, **options)
-    component_params = {
-      sensitive: sensitive_viewer?(status, current_account),
-      card: serialize_status_card(status).as_json,
-    }.merge(**options)
-
-    react_component :card, component_params
-  end
-
-  def render_poll_component(status, **options)
-    component_params = {
-      disabled: true,
-      poll: serialize_status_poll(status).as_json,
-    }.merge(**options)
-
-    react_component :poll, component_params do
-      render partial: 'statuses/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: prefers_autoplay? }
-    end
-  end
-
   private
 
   def serialize_media_attachment(attachment)
@@ -86,22 +66,6 @@ module MediaComponentHelper
     )
   end
 
-  def serialize_status_card(status)
-    ActiveModelSerializers::SerializableResource.new(
-      status.preview_card,
-      serializer: REST::PreviewCardSerializer
-    )
-  end
-
-  def serialize_status_poll(status)
-    ActiveModelSerializers::SerializableResource.new(
-      status.preloadable_poll,
-      serializer: REST::PollSerializer,
-      scope: current_user,
-      scope_name: :current_user
-    )
-  end
-
   def sensitive_viewer?(status, account)
     if !account.nil? && account.id == status.account_id
       status.sensitive
diff --git a/app/javascript/entrypoints/embed.tsx b/app/javascript/entrypoints/embed.tsx
new file mode 100644
index 0000000000..f8c824d287
--- /dev/null
+++ b/app/javascript/entrypoints/embed.tsx
@@ -0,0 +1,74 @@
+import './public-path';
+import { createRoot } from 'react-dom/client';
+
+import { afterInitialRender } from 'mastodon/../hooks/useRenderSignal';
+
+import { start } from '../mastodon/common';
+import { Status } from '../mastodon/features/standalone/status';
+import { loadPolyfills } from '../mastodon/polyfills';
+import ready from '../mastodon/ready';
+
+start();
+
+function loaded() {
+  const mountNode = document.getElementById('mastodon-status');
+
+  if (mountNode) {
+    const attr = mountNode.getAttribute('data-props');
+
+    if (!attr) return;
+
+    const props = JSON.parse(attr) as { id: string; locale: string };
+    const root = createRoot(mountNode);
+
+    root.render(<Status {...props} />);
+  }
+}
+
+function main() {
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
+}
+
+loadPolyfills()
+  .then(main)
+  .catch((error: unknown) => {
+    console.error(error);
+  });
+
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  // We use a timeout to allow for the React page to render before calculating the height
+  afterInitialRender(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0]?.scrollHeight,
+      },
+      '*',
+    );
+  });
+});
diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index b06675c2ee..d33e00d5da 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -37,43 +37,6 @@ const messages = defineMessages({
   },
 });
 
-interface SetHeightMessage {
-  type: 'setHeight';
-  id: string;
-  height: number;
-}
-
-function isSetHeightMessage(data: unknown): data is SetHeightMessage {
-  if (
-    data &&
-    typeof data === 'object' &&
-    'type' in data &&
-    data.type === 'setHeight'
-  )
-    return true;
-  else return false;
-}
-
-window.addEventListener('message', (e) => {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
-  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
-
-  const data = e.data;
-
-  ready(() => {
-    window.parent.postMessage(
-      {
-        type: 'setHeight',
-        id: data.id,
-        height: document.getElementsByTagName('html')[0]?.scrollHeight,
-      },
-      '*',
-    );
-  }).catch((e: unknown) => {
-    console.error('Error in setHeightMessage postMessage', e);
-  });
-});
-
 function loaded() {
   const { messages: localeData } = getLocale();
 
diff --git a/app/javascript/hooks/useRenderSignal.ts b/app/javascript/hooks/useRenderSignal.ts
new file mode 100644
index 0000000000..740df4a35a
--- /dev/null
+++ b/app/javascript/hooks/useRenderSignal.ts
@@ -0,0 +1,32 @@
+// This hook allows a component to signal that it's done rendering in a way that
+// can be used by e.g. our embed code to determine correct iframe height
+
+let renderSignalReceived = false;
+
+type Callback = () => void;
+
+let onInitialRender: Callback;
+
+export const afterInitialRender = (callback: Callback) => {
+  if (renderSignalReceived) {
+    callback();
+  } else {
+    onInitialRender = callback;
+  }
+};
+
+export const useRenderSignal = () => {
+  return () => {
+    if (renderSignalReceived) {
+      return;
+    }
+
+    renderSignalReceived = true;
+
+    if (typeof onInitialRender !== 'undefined') {
+      window.requestAnimationFrame(() => {
+        onInitialRender();
+      });
+    }
+  };
+};
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 340cee8024..1e4e545d8c 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -49,11 +49,13 @@ export function fetchStatusRequest(id, skipLoading) {
   };
 }
 
-export function fetchStatus(id, forceFetch = false) {
+export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) {
   return (dispatch, getState) => {
     const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null;
 
-    dispatch(fetchContext(id));
+    if (alsoFetchContext) {
+      dispatch(fetchContext(id));
+    }
 
     if (skipLoading) {
       return;
diff --git a/app/javascript/mastodon/components/logo.tsx b/app/javascript/mastodon/components/logo.tsx
index b7f8bd6695..fe9680d0e3 100644
--- a/app/javascript/mastodon/components/logo.tsx
+++ b/app/javascript/mastodon/components/logo.tsx
@@ -7,6 +7,13 @@ export const WordmarkLogo: React.FC = () => (
   </svg>
 );
 
+export const IconLogo: React.FC = () => (
+  <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+    <title>Mastodon</title>
+    <use xlinkHref='#logo-symbol-icon' />
+  </svg>
+);
+
 export const SymbolLogo: React.FC = () => (
   <img src={logo} alt='Mastodon' className='logo logo--icon' />
 );
diff --git a/app/javascript/mastodon/components/more_from_author.jsx b/app/javascript/mastodon/components/more_from_author.jsx
index c20e76ac45..719f4dda86 100644
--- a/app/javascript/mastodon/components/more_from_author.jsx
+++ b/app/javascript/mastodon/components/more_from_author.jsx
@@ -2,14 +2,12 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import { IconLogo } from 'mastodon/components/logo';
 import { AuthorLink } from 'mastodon/features/explore/components/author_link';
 
 export const MoreFromAuthor = ({ accountId }) => (
   <div className='more-from-author'>
-    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
-      <use xlinkHref='#logo-symbol-icon' />
-    </svg>
-
+    <IconLogo />
     <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <AuthorLink accountId={accountId} /> }} />
   </div>
 );
diff --git a/app/javascript/mastodon/features/standalone/status/index.tsx b/app/javascript/mastodon/features/standalone/status/index.tsx
new file mode 100644
index 0000000000..d5cb7e7f40
--- /dev/null
+++ b/app/javascript/mastodon/features/standalone/status/index.tsx
@@ -0,0 +1,87 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return,
+                  @typescript-eslint/no-explicit-any,
+                  @typescript-eslint/no-unsafe-assignment */
+
+import { useEffect, useCallback } from 'react';
+
+import { Provider } from 'react-redux';
+
+import { useRenderSignal } from 'mastodon/../hooks/useRenderSignal';
+import { fetchStatus, toggleStatusSpoilers } from 'mastodon/actions/statuses';
+import { hydrateStore } from 'mastodon/actions/store';
+import { Router } from 'mastodon/components/router';
+import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
+import initialState from 'mastodon/initial_state';
+import { IntlProvider } from 'mastodon/locales';
+import { makeGetStatus, makeGetPictureInPicture } from 'mastodon/selectors';
+import { store, useAppSelector, useAppDispatch } from 'mastodon/store';
+
+const getStatus = makeGetStatus() as unknown as (arg0: any, arg1: any) => any;
+const getPictureInPicture = makeGetPictureInPicture() as unknown as (
+  arg0: any,
+  arg1: any,
+) => any;
+
+const Embed: React.FC<{ id: string }> = ({ id }) => {
+  const status = useAppSelector((state) => getStatus(state, { id }));
+  const pictureInPicture = useAppSelector((state) =>
+    getPictureInPicture(state, { id }),
+  );
+  const domain = useAppSelector((state) => state.meta.get('domain'));
+  const dispatch = useAppDispatch();
+  const dispatchRenderSignal = useRenderSignal();
+
+  useEffect(() => {
+    dispatch(fetchStatus(id, false, false));
+  }, [dispatch, id]);
+
+  const handleToggleHidden = useCallback(() => {
+    dispatch(toggleStatusSpoilers(id));
+  }, [dispatch, id]);
+
+  // This allows us to calculate the correct page height for embeds
+  if (status) {
+    dispatchRenderSignal();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const permalink = status?.get('url') as string;
+
+  return (
+    <div className='embed'>
+      <DetailedStatus
+        status={status}
+        domain={domain}
+        pictureInPicture={pictureInPicture}
+        onToggleHidden={handleToggleHidden}
+        withLogo
+      />
+
+      <a
+        className='embed__overlay'
+        href={permalink}
+        target='_blank'
+        rel='noreferrer noopener'
+        aria-label=''
+      />
+    </div>
+  );
+};
+
+export const Status: React.FC<{ id: string }> = ({ id }) => {
+  useEffect(() => {
+    if (initialState) {
+      store.dispatch(hydrateStore(initialState));
+    }
+  }, []);
+
+  return (
+    <IntlProvider>
+      <Provider store={store}>
+        <Router>
+          <Embed id={id} />
+        </Router>
+      </Provider>
+    </IntlProvider>
+  );
+};
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
deleted file mode 100644
index 8ee1ec9b9b..0000000000
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ /dev/null
@@ -1,322 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedDate, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import { AnimatedNumber } from 'mastodon/components/animated_number';
-import { ContentWarning } from 'mastodon/components/content_warning';
-import EditedTimestamp from 'mastodon/components/edited_timestamp';
-import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
-import { Icon }  from 'mastodon/components/icon';
-import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
-import { VisibilityIcon } from 'mastodon/components/visibility_icon';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import MediaGallery from '../../../components/media_gallery';
-import StatusContent from '../../../components/status_content';
-import Audio from '../../audio';
-import scheduleIdleTask from '../../ui/util/schedule_idle_task';
-import Video from '../../video';
-
-import Card from './card';
-
-class DetailedStatus extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    onOpenMedia: PropTypes.func.isRequired,
-    onOpenVideo: PropTypes.func.isRequired,
-    onToggleHidden: PropTypes.func.isRequired,
-    onTranslate: PropTypes.func.isRequired,
-    measureHeight: PropTypes.bool,
-    onHeightChange: PropTypes.func,
-    domain: PropTypes.string.isRequired,
-    compact: PropTypes.bool,
-    showMedia: PropTypes.bool,
-    pictureInPicture: ImmutablePropTypes.contains({
-      inUse: PropTypes.bool,
-      available: PropTypes.bool,
-    }),
-    onToggleMediaVisibility: PropTypes.func,
-    ...WithRouterPropTypes,
-  };
-
-  state = {
-    height: null,
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.props.history) {
-      e.preventDefault();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-
-    e.stopPropagation();
-  };
-
-  handleOpenVideo = (options) => {
-    this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
-  };
-
-  handleExpandedToggle = () => {
-    this.props.onToggleHidden(this.props.status);
-  };
-
-  _measureHeight (heightJustChanged) {
-    if (this.props.measureHeight && this.node) {
-      scheduleIdleTask(() => this.node && this.setState({ height: Math.ceil(this.node.scrollHeight) + 1 }));
-
-      if (this.props.onHeightChange && heightJustChanged) {
-        this.props.onHeightChange();
-      }
-    }
-  }
-
-  setRef = c => {
-    this.node = c;
-    this._measureHeight();
-  };
-
-  componentDidUpdate (prevProps, prevState) {
-    this._measureHeight(prevState.height !== this.state.height);
-  }
-
-  handleModalLink = e => {
-    e.preventDefault();
-
-    let href;
-
-    if (e.target.nodeName !== 'A') {
-      href = e.target.parentNode.href;
-    } else {
-      href = e.target.href;
-    }
-
-    window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
-  };
-
-  handleTranslate = () => {
-    const { onTranslate, status } = this.props;
-    onTranslate(status);
-  };
-
-  _properStatus () {
-    const { status } = this.props;
-
-    if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
-      return status.get('reblog');
-    } else {
-      return status;
-    }
-  }
-
-  getAttachmentAspectRatio () {
-    const attachments = this._properStatus().get('media_attachments');
-
-    if (attachments.getIn([0, 'type']) === 'video') {
-      return `${attachments.getIn([0, 'meta', 'original', 'width'])} / ${attachments.getIn([0, 'meta', 'original', 'height'])}`;
-    } else if (attachments.getIn([0, 'type']) === 'audio') {
-      return '16 / 9';
-    } else {
-      return (attachments.size === 1 && attachments.getIn([0, 'meta', 'small', 'aspect'])) ? attachments.getIn([0, 'meta', 'small', 'aspect']) : '3 / 2';
-    }
-  }
-
-  render () {
-    const status = this._properStatus();
-    const outerStyle = { boxSizing: 'border-box' };
-    const { compact, pictureInPicture } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    let media           = '';
-    let applicationLink = '';
-    let reblogLink = '';
-    let favouriteLink = '';
-
-    if (this.props.measureHeight) {
-      outerStyle.height = `${this.state.height}px`;
-    }
-
-    const language = status.getIn(['translation', 'language']) || status.get('language');
-
-    if (pictureInPicture.get('inUse')) {
-      media = <PictureInPicturePlaceholder aspectRatio={this.getAttachmentAspectRatio()} />;
-    } else if (status.get('media_attachments').size > 0) {
-      if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-        const attachment = status.getIn(['media_attachments', 0]);
-        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
-
-        media = (
-          <Audio
-            src={attachment.get('url')}
-            alt={description}
-            lang={language}
-            duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-            poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
-            backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
-            foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
-            accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
-            sensitive={status.get('sensitive')}
-            visible={this.props.showMedia}
-            blurhash={attachment.get('blurhash')}
-            height={150}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />
-        );
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        const attachment = status.getIn(['media_attachments', 0]);
-        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
-
-        media = (
-          <Video
-            preview={attachment.get('preview_url')}
-            frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
-            aspectRatio={`${attachment.getIn(['meta', 'original', 'width'])} / ${attachment.getIn(['meta', 'original', 'height'])}`}
-            blurhash={attachment.get('blurhash')}
-            src={attachment.get('url')}
-            alt={description}
-            lang={language}
-            width={300}
-            height={150}
-            onOpenVideo={this.handleOpenVideo}
-            sensitive={status.get('sensitive')}
-            visible={this.props.showMedia}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />
-        );
-      } else {
-        media = (
-          <MediaGallery
-            standalone
-            sensitive={status.get('sensitive')}
-            media={status.get('media_attachments')}
-            lang={language}
-            height={300}
-            onOpenMedia={this.props.onOpenMedia}
-            visible={this.props.showMedia}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />
-        );
-      }
-    } else if (status.get('spoiler_text').length === 0) {
-      media = <Card sensitive={status.get('sensitive')} onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
-    }
-
-    if (status.get('application')) {
-      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
-    }
-
-    const visibilityLink = <>·<VisibilityIcon visibility={status.get('visibility')} /></>;
-
-    if (['private', 'direct'].includes(status.get('visibility'))) {
-      reblogLink = '';
-    } else if (this.props.history) {
-      reblogLink = (
-        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-          <span className='detailed-status__reblogs'>
-            <AnimatedNumber value={status.get('reblogs_count')} />
-          </span>
-          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
-        </Link>
-      );
-    } else {
-      reblogLink = (
-        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <span className='detailed-status__reblogs'>
-            <AnimatedNumber value={status.get('reblogs_count')} />
-          </span>
-          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
-        </a>
-      );
-    }
-
-    if (this.props.history) {
-      favouriteLink = (
-        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <span className='detailed-status__favorites'>
-            <AnimatedNumber value={status.get('favourites_count')} />
-          </span>
-          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
-        </Link>
-      );
-    } else {
-      favouriteLink = (
-        <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <span className='detailed-status__favorites'>
-            <AnimatedNumber value={status.get('favourites_count')} />
-          </span>
-          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
-        </a>
-      );
-    }
-
-    const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
-
-    return (
-      <div style={outerStyle}>
-        <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
-          {status.get('visibility') === 'direct' && (
-            <div className='status__prepend'>
-              <div className='status__prepend-icon-wrapper'><Icon id='at' icon={AlternateEmailIcon} className='status__prepend-icon' /></div>
-              <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
-            </div>
-          )}
-          <a href={`/@${status.getIn(['account', 'acct'])}`} data-hover-card-account={status.getIn(['account', 'id'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={46} /></div>
-            <DisplayName account={status.get('account')} localDomain={this.props.domain} />
-          </a>
-
-          {status.get('spoiler_text').length > 0 && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
-
-          {expanded && (
-            <>
-              <StatusContent
-                status={status}
-                onTranslate={this.handleTranslate}
-                {...statusContentProps}
-              />
-
-              {media}
-              {hashtagBar}
-            </>
-          )}
-
-          <div className='detailed-status__meta'>
-            <div className='detailed-status__meta__line'>
-              <a className='detailed-status__datetime' href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} target='_blank' rel='noopener noreferrer'>
-                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-              </a>
-
-              {visibilityLink}
-
-              {applicationLink}
-            </div>
-
-            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
-
-            <div className='detailed-status__meta__line'>
-              {reblogLink}
-              {reblogLink && <>·</>}
-              {favouriteLink}
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(DetailedStatus);
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
new file mode 100644
index 0000000000..fa843122fb
--- /dev/null
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -0,0 +1,390 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access,
+                  @typescript-eslint/no-unsafe-call,
+                  @typescript-eslint/no-explicit-any,
+                  @typescript-eslint/no-unsafe-assignment */
+
+import type { CSSProperties } from 'react';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedDate, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import { AnimatedNumber } from 'mastodon/components/animated_number';
+import { ContentWarning } from 'mastodon/components/content_warning';
+import EditedTimestamp from 'mastodon/components/edited_timestamp';
+import type { StatusLike } from 'mastodon/components/hashtag_bar';
+import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
+import { Icon } from 'mastodon/components/icon';
+import { IconLogo } from 'mastodon/components/logo';
+import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
+import { VisibilityIcon } from 'mastodon/components/visibility_icon';
+
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import MediaGallery from '../../../components/media_gallery';
+import StatusContent from '../../../components/status_content';
+import Audio from '../../audio';
+import scheduleIdleTask from '../../ui/util/schedule_idle_task';
+import Video from '../../video';
+
+import Card from './card';
+
+interface VideoModalOptions {
+  startTime: number;
+  autoPlay?: boolean;
+  defaultVolume: number;
+  componentIndex: number;
+}
+
+export const DetailedStatus: React.FC<{
+  status: any;
+  onOpenMedia?: (status: any, index: number, lang: string) => void;
+  onOpenVideo?: (status: any, lang: string, options: VideoModalOptions) => void;
+  onTranslate?: (status: any) => void;
+  measureHeight?: boolean;
+  onHeightChange?: () => void;
+  domain: string;
+  showMedia?: boolean;
+  withLogo?: boolean;
+  pictureInPicture: any;
+  onToggleHidden?: (status: any) => void;
+  onToggleMediaVisibility?: () => void;
+}> = ({
+  status,
+  onOpenMedia,
+  onOpenVideo,
+  onTranslate,
+  measureHeight,
+  onHeightChange,
+  domain,
+  showMedia,
+  withLogo,
+  pictureInPicture,
+  onToggleMediaVisibility,
+  onToggleHidden,
+}) => {
+  const properStatus = status?.get('reblog') ?? status;
+  const [height, setHeight] = useState(0);
+  const nodeRef = useRef<HTMLDivElement>();
+
+  const handleOpenVideo = useCallback(
+    (options: VideoModalOptions) => {
+      const lang = (status.getIn(['translation', 'language']) ||
+        status.get('language')) as string;
+      if (onOpenVideo)
+        onOpenVideo(status.getIn(['media_attachments', 0]), lang, options);
+    },
+    [onOpenVideo, status],
+  );
+
+  const handleExpandedToggle = useCallback(() => {
+    if (onToggleHidden) onToggleHidden(status);
+  }, [onToggleHidden, status]);
+
+  const _measureHeight = useCallback(
+    (heightJustChanged?: boolean) => {
+      if (measureHeight && nodeRef.current) {
+        scheduleIdleTask(() => {
+          if (nodeRef.current)
+            setHeight(Math.ceil(nodeRef.current.scrollHeight) + 1);
+        });
+
+        if (onHeightChange && heightJustChanged) {
+          onHeightChange();
+        }
+      }
+    },
+    [onHeightChange, measureHeight, setHeight],
+  );
+
+  const handleRef = useCallback(
+    (c: HTMLDivElement) => {
+      nodeRef.current = c;
+      _measureHeight();
+    },
+    [_measureHeight],
+  );
+
+  const handleTranslate = useCallback(() => {
+    if (onTranslate) onTranslate(status);
+  }, [onTranslate, status]);
+
+  if (!properStatus) {
+    return null;
+  }
+
+  let media;
+  let applicationLink;
+  let reblogLink;
+  let attachmentAspectRatio;
+
+  if (properStatus.get('media_attachments').getIn([0, 'type']) === 'video') {
+    attachmentAspectRatio = `${properStatus.get('media_attachments').getIn([0, 'meta', 'original', 'width'])} / ${properStatus.get('media_attachments').getIn([0, 'meta', 'original', 'height'])}`;
+  } else if (
+    properStatus.get('media_attachments').getIn([0, 'type']) === 'audio'
+  ) {
+    attachmentAspectRatio = '16 / 9';
+  } else {
+    attachmentAspectRatio =
+      properStatus.get('media_attachments').size === 1 &&
+      properStatus
+        .get('media_attachments')
+        .getIn([0, 'meta', 'small', 'aspect'])
+        ? properStatus
+            .get('media_attachments')
+            .getIn([0, 'meta', 'small', 'aspect'])
+        : '3 / 2';
+  }
+
+  const outerStyle = { boxSizing: 'border-box' } as CSSProperties;
+
+  if (measureHeight) {
+    outerStyle.height = height;
+  }
+
+  const language =
+    status.getIn(['translation', 'language']) || status.get('language');
+
+  if (pictureInPicture.get('inUse')) {
+    media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
+  } else if (status.get('media_attachments').size > 0) {
+    if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+      const attachment = status.getIn(['media_attachments', 0]);
+      const description =
+        attachment.getIn(['translation', 'description']) ||
+        attachment.get('description');
+
+      media = (
+        <Audio
+          src={attachment.get('url')}
+          alt={description}
+          lang={language}
+          duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+          poster={
+            attachment.get('preview_url') ||
+            status.getIn(['account', 'avatar_static'])
+          }
+          backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+          foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+          accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+          sensitive={status.get('sensitive')}
+          visible={showMedia}
+          blurhash={attachment.get('blurhash')}
+          height={150}
+          onToggleVisibility={onToggleMediaVisibility}
+        />
+      );
+    } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+      const attachment = status.getIn(['media_attachments', 0]);
+      const description =
+        attachment.getIn(['translation', 'description']) ||
+        attachment.get('description');
+
+      media = (
+        <Video
+          preview={attachment.get('preview_url')}
+          frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
+          aspectRatio={`${attachment.getIn(['meta', 'original', 'width'])} / ${attachment.getIn(['meta', 'original', 'height'])}`}
+          blurhash={attachment.get('blurhash')}
+          src={attachment.get('url')}
+          alt={description}
+          lang={language}
+          width={300}
+          height={150}
+          onOpenVideo={handleOpenVideo}
+          sensitive={status.get('sensitive')}
+          visible={showMedia}
+          onToggleVisibility={onToggleMediaVisibility}
+        />
+      );
+    } else {
+      media = (
+        <MediaGallery
+          standalone
+          sensitive={status.get('sensitive')}
+          media={status.get('media_attachments')}
+          lang={language}
+          height={300}
+          onOpenMedia={onOpenMedia}
+          visible={showMedia}
+          onToggleVisibility={onToggleMediaVisibility}
+        />
+      );
+    }
+  } else if (status.get('spoiler_text').length === 0) {
+    media = (
+      <Card
+        sensitive={status.get('sensitive')}
+        onOpenMedia={onOpenMedia}
+        card={status.get('card', null)}
+      />
+    );
+  }
+
+  if (status.get('application')) {
+    applicationLink = (
+      <>
+        ·
+        <a
+          className='detailed-status__application'
+          href={status.getIn(['application', 'website'])}
+          target='_blank'
+          rel='noopener noreferrer'
+        >
+          {status.getIn(['application', 'name'])}
+        </a>
+      </>
+    );
+  }
+
+  const visibilityLink = (
+    <>
+      ·<VisibilityIcon visibility={status.get('visibility')} />
+    </>
+  );
+
+  if (['private', 'direct'].includes(status.get('visibility') as string)) {
+    reblogLink = '';
+  } else {
+    reblogLink = (
+      <Link
+        to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`}
+        className='detailed-status__link'
+      >
+        <span className='detailed-status__reblogs'>
+          <AnimatedNumber value={status.get('reblogs_count')} />
+        </span>
+        <FormattedMessage
+          id='status.reblogs'
+          defaultMessage='{count, plural, one {boost} other {boosts}}'
+          values={{ count: status.get('reblogs_count') }}
+        />
+      </Link>
+    );
+  }
+
+  const favouriteLink = (
+    <Link
+      to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
+      className='detailed-status__link'
+    >
+      <span className='detailed-status__favorites'>
+        <AnimatedNumber value={status.get('favourites_count')} />
+      </span>
+      <FormattedMessage
+        id='status.favourites'
+        defaultMessage='{count, plural, one {favorite} other {favorites}}'
+        values={{ count: status.get('favourites_count') }}
+      />
+    </Link>
+  );
+
+  const { statusContentProps, hashtagBar } = getHashtagBarForStatus(
+    status as StatusLike,
+  );
+  const expanded =
+    !status.get('hidden') || status.get('spoiler_text').length === 0;
+
+  return (
+    <div style={outerStyle}>
+      <div ref={handleRef} className={classNames('detailed-status')}>
+        {status.get('visibility') === 'direct' && (
+          <div className='status__prepend'>
+            <div className='status__prepend-icon-wrapper'>
+              <Icon
+                id='at'
+                icon={AlternateEmailIcon}
+                className='status__prepend-icon'
+              />
+            </div>
+            <FormattedMessage
+              id='status.direct_indicator'
+              defaultMessage='Private mention'
+            />
+          </div>
+        )}
+        <Link
+          to={`/@${status.getIn(['account', 'acct'])}`}
+          data-hover-card-account={status.getIn(['account', 'id'])}
+          className='detailed-status__display-name'
+        >
+          <div className='detailed-status__display-avatar'>
+            <Avatar account={status.get('account')} size={46} />
+          </div>
+          <DisplayName account={status.get('account')} localDomain={domain} />
+          {withLogo && (
+            <>
+              <div className='spacer' />
+              <IconLogo />
+            </>
+          )}
+        </Link>
+
+        {status.get('spoiler_text').length > 0 && (
+          <ContentWarning
+            text={
+              status.getIn(['translation', 'spoilerHtml']) ||
+              status.get('spoilerHtml')
+            }
+            expanded={expanded}
+            onClick={handleExpandedToggle}
+          />
+        )}
+
+        {expanded && (
+          <>
+            <StatusContent
+              status={status}
+              onTranslate={handleTranslate}
+              {...(statusContentProps as any)}
+            />
+
+            {media}
+            {hashtagBar}
+          </>
+        )}
+
+        <div className='detailed-status__meta'>
+          <div className='detailed-status__meta__line'>
+            <a
+              className='detailed-status__datetime'
+              href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`}
+              target='_blank'
+              rel='noopener noreferrer'
+            >
+              <FormattedDate
+                value={new Date(status.get('created_at') as string)}
+                year='numeric'
+                month='short'
+                day='2-digit'
+                hour='2-digit'
+                minute='2-digit'
+              />
+            </a>
+
+            {visibilityLink}
+            {applicationLink}
+          </div>
+
+          {status.get('edited_at') && (
+            <div className='detailed-status__meta__line'>
+              <EditedTimestamp
+                statusId={status.get('id')}
+                timestamp={status.get('edited_at')}
+              />
+            </div>
+          )}
+
+          <div className='detailed-status__meta__line'>
+            {reblogLink}
+            {reblogLink && <>·</>}
+            {favouriteLink}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
deleted file mode 100644
index 0e73697fef..0000000000
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import { injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { showAlertForError } from '../../../actions/alerts';
-import { initBlockModal } from '../../../actions/blocks';
-import {
-  replyCompose,
-  mentionCompose,
-  directCompose,
-} from '../../../actions/compose';
-import {
-  toggleReblog,
-  toggleFavourite,
-  pin,
-  unpin,
-} from '../../../actions/interactions';
-import { openModal } from '../../../actions/modal';
-import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from '../../../actions/reports';
-import {
-  muteStatus,
-  unmuteStatus,
-  deleteStatus,
-  toggleStatusSpoilers,
-} from '../../../actions/statuses';
-import { deleteModal } from '../../../initial_state';
-import { makeGetStatus, makeGetPictureInPicture } from '../../../selectors';
-import DetailedStatus from '../components/detailed_status';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-  const getPictureInPicture = makeGetPictureInPicture();
-
-  const mapStateToProps = (state, props) => ({
-    status: getStatus(state, props),
-    domain: state.getIn(['meta', 'domain']),
-    pictureInPicture: getPictureInPicture(state, props),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch) => ({
-
-  onReply (status) {
-    dispatch((_, getState) => {
-      let state = getState();
-      if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
-      } else {
-        dispatch(replyCompose(status));
-      }
-    });
-  },
-
-  onReblog (status, e) {
-    dispatch(toggleReblog(status.get('id'), e.shiftKey));
-  },
-
-  onFavourite (status) {
-    dispatch(toggleFavourite(status.get('id')));
-  },
-
-  onPin (status) {
-    if (status.get('pinned')) {
-      dispatch(unpin(status));
-    } else {
-      dispatch(pin(status));
-    }
-  },
-
-  onEmbed (status) {
-    dispatch(openModal({
-      modalType: 'EMBED',
-      modalProps: {
-        id: status.get('id'),
-        onError: error => dispatch(showAlertForError(error)),
-      },
-    }));
-  },
-
-  onDelete (status, withRedraft = false) {
-    if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), withRedraft));
-    } else {
-      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
-    }
-  },
-
-  onDirect (account) {
-    dispatch(directCompose(account));
-  },
-
-  onMention (account) {
-    dispatch(mentionCompose(account));
-  },
-
-  onOpenMedia (media, index, lang) {
-    dispatch(openModal({
-      modalType: 'MEDIA',
-      modalProps: { media, index, lang },
-    }));
-  },
-
-  onOpenVideo (media, lang, options) {
-    dispatch(openModal({
-      modalType: 'VIDEO',
-      modalProps: { media, lang, options },
-    }));
-  },
-
-  onBlock (status) {
-    const account = status.get('account');
-    dispatch(initBlockModal(account));
-  },
-
-  onReport (status) {
-    dispatch(initReport(status.get('account'), status));
-  },
-
-  onMute (account) {
-    dispatch(initMuteModal(account));
-  },
-
-  onMuteConversation (status) {
-    if (status.get('muted')) {
-      dispatch(unmuteStatus(status.get('id')));
-    } else {
-      dispatch(muteStatus(status.get('id')));
-    }
-  },
-
-  onToggleHidden (status) {
-    dispatch(toggleStatusSpoilers(status.get('id')));
-  },
-
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 5f325fe7b8..c115f77755 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -69,7 +69,7 @@ import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
 
 import ActionBar from './components/action_bar';
-import DetailedStatus from './components/detailed_status';
+import { DetailedStatus } from './components/detailed_status';
 
 
 const messages = defineMessages({
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 0dd573da9b..465b748078 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -11,7 +11,6 @@
 @import 'mastodon/widgets';
 @import 'mastodon/forms';
 @import 'mastodon/accounts';
-@import 'mastodon/statuses';
 @import 'mastodon/components';
 @import 'mastodon/polls';
 @import 'mastodon/modal';
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5a8fa3e5c0..c6ce8f55ab 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1677,18 +1677,6 @@ body > [data-popper-placement] {
   padding: 16px;
   border-top: 1px solid var(--background-border-color);
 
-  &--flex {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-items: flex-start;
-
-    .status__content,
-    .detailed-status__meta {
-      flex: 100%;
-    }
-  }
-
   .status__content {
     font-size: 19px;
     line-height: 24px;
@@ -1723,6 +1711,25 @@ body > [data-popper-placement] {
       margin-bottom: 0;
     }
   }
+
+  .logo {
+    width: 40px;
+    height: 40px;
+    color: $dark-text-color;
+  }
+}
+
+.embed {
+  position: relative;
+
+  &__overlay {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
deleted file mode 100644
index b6d4f98cce..0000000000
--- a/app/javascript/styles/mastodon/statuses.scss
+++ /dev/null
@@ -1,152 +0,0 @@
-.activity-stream {
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  border-radius: 4px;
-  overflow: hidden;
-  margin-bottom: 10px;
-
-  &--under-tabs {
-    border-radius: 0 0 4px 4px;
-  }
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    margin-bottom: 0;
-    border-radius: 0;
-    box-shadow: none;
-  }
-
-  &--headless {
-    border-radius: 0;
-    margin: 0;
-    box-shadow: none;
-
-    .detailed-status,
-    .status {
-      border-radius: 0 !important;
-    }
-  }
-
-  div[data-component] {
-    width: 100%;
-  }
-
-  .entry {
-    background: $ui-base-color;
-
-    .detailed-status,
-    .status,
-    .load-more {
-      animation: none;
-    }
-
-    &:last-child {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-bottom: 0;
-        border-radius: 0 0 4px 4px;
-      }
-    }
-
-    &:first-child {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-radius: 4px 4px 0 0;
-      }
-
-      &:last-child {
-        .detailed-status,
-        .status,
-        .load-more {
-          border-radius: 4px;
-        }
-      }
-    }
-
-    @media screen and (width <= 740px) {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-radius: 0 !important;
-      }
-    }
-  }
-
-  &--highlighted .entry {
-    background: lighten($ui-base-color, 8%);
-  }
-}
-
-.button.logo-button svg {
-  width: 20px;
-  height: auto;
-  vertical-align: middle;
-  margin-inline-end: 5px;
-  fill: $primary-text-color;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    display: none;
-  }
-}
-
-.embed {
-  .status__content[data-spoiler='folded'] {
-    .e-content {
-      display: none;
-    }
-
-    p:first-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .detailed-status {
-    padding: 15px;
-
-    .detailed-status__display-avatar .account__avatar {
-      width: 48px;
-      height: 48px;
-    }
-  }
-
-  .status {
-    padding: 15px 15px 15px (48px + 15px * 2);
-    min-height: 48px + 2px;
-
-    &__avatar {
-      inset-inline-start: 15px;
-      top: 17px;
-
-      .account__avatar {
-        width: 48px;
-        height: 48px;
-      }
-    }
-
-    &__content {
-      padding-top: 5px;
-    }
-
-    &__prepend {
-      margin-inline-start: 48px + 15px * 2;
-      padding-top: 15px;
-    }
-
-    &__prepend-icon-wrapper {
-      inset-inline-start: -32px;
-    }
-
-    .media-gallery,
-    &__action-bar,
-    .video-player {
-      margin-top: 10px;
-    }
-
-    &__action-bar-button {
-      font-size: 18px;
-      width: 23.1429px;
-      height: 23.1429px;
-      line-height: 23.15px;
-    }
-  }
-}
diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb
index d6261d7242..3882b0e305 100644
--- a/app/serializers/oembed_serializer.rb
+++ b/app/serializers/oembed_serializer.rb
@@ -37,16 +37,16 @@ class OEmbedSerializer < ActiveModel::Serializer
   end
 
   def html
-    attributes = {
-      src: embed_short_account_status_url(object.account, object),
-      class: 'mastodon-embed',
-      style: 'max-width: 100%; border: 0',
-      width: width,
-      height: height,
-      allowfullscreen: true,
-    }
-
-    content_tag(:iframe, nil, attributes) + content_tag(:script, nil, src: full_asset_url('embed.js', skip_pipeline: true), async: true)
+    <<~HTML.squish
+      <blockquote class="mastodon-embed" data-embed-url="#{embed_short_account_status_url(object.account, object)}" style="max-width: 540px; min-width: 270px; background:#FCF8FF; border: 1px solid #C9C4DA; border-radius: 8px; overflow: hidden; margin: 0; padding: 0;">
+        <a href="#{short_account_status_url(object.account, object)}" target="_blank" style="color: #1C1A25; text-decoration: none; display: flex; align-items: center; justify-content: center; flex-direction: column; padding: 24px; font-size: 14px; line-height: 20px; letter-spacing: 0.25px; font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Roboto, sans-serif;">
+          <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 79 75"><path d="M74.7135 16.6043C73.6199 8.54587 66.5351 2.19527 58.1366 0.964691C56.7196 0.756754 51.351 0 38.9148 0H38.822C26.3824 0 23.7135 0.756754 22.2966 0.964691C14.1319 2.16118 6.67571 7.86752 4.86669 16.0214C3.99657 20.0369 3.90371 24.4888 4.06535 28.5726C4.29578 34.4289 4.34049 40.275 4.877 46.1075C5.24791 49.9817 5.89495 53.8251 6.81328 57.6088C8.53288 64.5968 15.4938 70.4122 22.3138 72.7848C29.6155 75.259 37.468 75.6697 44.9919 73.971C45.8196 73.7801 46.6381 73.5586 47.4475 73.3063C49.2737 72.7302 51.4164 72.086 52.9915 70.9542C53.0131 70.9384 53.0308 70.9178 53.0433 70.8942C53.0558 70.8706 53.0628 70.8445 53.0637 70.8179V65.1661C53.0634 65.1412 53.0574 65.1167 53.0462 65.0944C53.035 65.0721 53.0189 65.0525 52.9992 65.0371C52.9794 65.0218 52.9564 65.011 52.9318 65.0056C52.9073 65.0002 52.8819 65.0003 52.8574 65.0059C48.0369 66.1472 43.0971 66.7193 38.141 66.7103C29.6118 66.7103 27.3178 62.6981 26.6609 61.0278C26.1329 59.5842 25.7976 58.0784 25.6636 56.5486C25.6622 56.5229 25.667 56.4973 25.6775 56.4738C25.688 56.4502 25.7039 56.4295 25.724 56.4132C25.7441 56.397 25.7678 56.3856 25.7931 56.3801C25.8185 56.3746 25.8448 56.3751 25.8699 56.3816C30.6101 57.5151 35.4693 58.0873 40.3455 58.086C41.5183 58.086 42.6876 58.086 43.8604 58.0553C48.7647 57.919 53.9339 57.6701 58.7591 56.7361C58.8794 56.7123 58.9998 56.6918 59.103 56.6611C66.7139 55.2124 73.9569 50.665 74.6929 39.1501C74.7204 38.6967 74.7892 34.4016 74.7892 33.9312C74.7926 32.3325 75.3085 22.5901 74.7135 16.6043ZM62.9996 45.3371H54.9966V25.9069C54.9966 21.8163 53.277 19.7302 49.7793 19.7302C45.9343 19.7302 44.0083 22.1981 44.0083 27.0727V37.7082H36.0534V27.0727C36.0534 22.1981 34.124 19.7302 30.279 19.7302C26.8019 19.7302 25.0651 21.8163 25.0617 25.9069V45.3371H17.0656V25.3172C17.0656 21.2266 18.1191 17.9769 20.2262 15.568C22.3998 13.1648 25.2509 11.9308 28.7898 11.9308C32.8859 11.9308 35.9812 13.492 38.0447 16.6111L40.036 19.9245L42.0308 16.6111C44.0943 13.492 47.1896 11.9308 51.2788 11.9308C54.8143 11.9308 57.6654 13.1648 59.8459 15.568C61.9529 17.9746 63.0065 21.2243 63.0065 25.3172L62.9996 45.3371Z" fill="currentColor"/></svg>
+          <div style="margin-top: 16px; color: #787588;">Post by @#{object.account.pretty_acct}@#{provider_name}</div>
+          <div style="font-weight: 500;">View on Mastodon</div>
+        </a>
+      </blockquote>
+      <script data-allowed-prefixes="#{root_url}" src="#{full_asset_url('embed.js', skip_pipeline: true)}" async="true"></script>
+    HTML
   end
 
   def width
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 9258e80833..0237e04515 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -15,7 +15,7 @@
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = render_initial_state
-    = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+    = javascript_pack_tag 'embed', integrity: true, crossorigin: 'anonymous'
   %body.embed
     = yield
 
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
deleted file mode 100644
index 6cd240bbbc..0000000000
--- a/app/views/statuses/_detailed_status.html.haml
+++ /dev/null
@@ -1,80 +0,0 @@
-.detailed-status.detailed-status--flex{ class: "detailed-status-#{status.visibility}" }
-  .p-author.h-card
-    = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'detailed-status__display-name u-url', target: stream_link_target, rel: 'noopener' do
-      .detailed-status__display-avatar
-        - if prefers_autoplay?
-          = image_tag status.account.avatar_original_url, alt: '', class: 'account__avatar u-photo'
-        - else
-          = image_tag status.account.avatar_static_url, alt: '', class: 'account__avatar u-photo'
-      %span.display-name
-        %bdi
-          %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: prefers_autoplay?)
-        %span.display-name__account
-          = acct(status.account)
-          = material_symbol('lock') if status.account.locked?
-
-  = account_action_button(status.account)
-
-  .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
-    - if status.spoiler_text?
-      %p<
-        %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}&nbsp;
-        %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language }
-      = prerender_custom_emojis(status_content_format(status), status.emojis)
-
-      - if status.preloadable_poll
-        = render_poll_component(status)
-
-  - if !status.ordered_media_attachments.empty?
-    - if status.ordered_media_attachments.first.video?
-      = render_video_component(status, width: 670, height: 380, detailed: true)
-    - elsif status.ordered_media_attachments.first.audio?
-      = render_audio_component(status, width: 670, height: 380)
-    - else
-      = render_media_gallery_component(status, height: 380, standalone: true)
-  - elsif status.preview_card
-    = render_card_component(status)
-
-  .detailed-status__meta
-    %data.dt-published{ value: status.created_at.to_time.iso8601 }
-    - if status.edited?
-      %data.dt-updated{ value: status.edited_at.to_time.iso8601 }
-
-    = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
-      %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
-    ·
-    - if status.edited?
-      = t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted'))
-      ·
-    %span.detailed-status__visibility-icon
-      = visibility_icon status
-    ·
-    - if status.application && status.account.user&.setting_show_application
-      - if status.application.website.blank?
-        %strong.detailed-status__application= status.application.name
-      - else
-        = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener noreferrer'
-      ·
-    %span.detailed-status__link
-      - if status.in_reply_to_id.nil?
-        = material_symbol('reply')
-      - else
-        = material_symbol('reply_all')
-      %span.detailed-status__reblogs>= friendly_number_to_human status.replies_count
-      &nbsp;
-    ·
-    - if status.public_visibility? || status.unlisted_visibility?
-      %span.detailed-status__link
-        = material_symbol('repeat')
-        %span.detailed-status__reblogs>= friendly_number_to_human status.reblogs_count
-        &nbsp;
-      ·
-    %span.detailed-status__link
-      = material_symbol('star')
-      %span.detailed-status__favorites>= friendly_number_to_human status.favourites_count
-      &nbsp;
-
-    - if user_signed_in?
-      ·
-      = link_to t('statuses.open_in_web'), web_url("@#{status.account.pretty_acct}/#{status.id}"), class: 'detailed-status__application', target: '_blank', rel: 'noopener noreferrer'
diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml
deleted file mode 100644
index 62416a44da..0000000000
--- a/app/views/statuses/_poll.html.haml
+++ /dev/null
@@ -1,36 +0,0 @@
-:ruby
-  show_results = (user_signed_in? && poll.voted?(current_account)) || poll.expired?
-  total_votes_count = poll.voters_count || poll.votes_count
-
-.poll
-  %ul
-    - poll.loaded_options.each do |option|
-      %li
-        - if show_results
-          - percent = total_votes_count.positive? ? 100 * option.votes_count / total_votes_count : 0
-          %label.poll__option><
-            %span.poll__number><
-              #{percent.round}%
-            %span.poll__option__text
-              = prerender_custom_emojis(h(option.title), status.emojis)
-
-          %progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' }
-            %span.poll__chart
-        - else
-          %label.poll__option><
-            %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil }><
-            %span.poll__option__text
-              = prerender_custom_emojis(h(option.title), status.emojis)
-  .poll__footer
-    - unless show_results
-      %button.button.button-secondary{ disabled: true }
-        = t('statuses.poll.vote')
-
-    - if poll.voters_count.nil?
-      %span= t('statuses.poll.total_votes', count: poll.votes_count)
-    - else
-      %span= t('statuses.poll.total_people', count: poll.voters_count)
-
-    - unless poll.expires_at.nil?
-      ·
-      %span= l poll.expires_at
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
deleted file mode 100644
index ee7900fbfa..0000000000
--- a/app/views/statuses/_simple_status.html.haml
+++ /dev/null
@@ -1,70 +0,0 @@
-:ruby
-  hide_show_thread ||= false
-
-.status{ class: "status-#{status.visibility}" }
-  .status__info
-    = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
-      %span.status__visibility-icon><
-        = visibility_icon status
-      %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
-      - if status.edited?
-        %abbr{ title: t('statuses.edited_at_html', date: l(status.edited_at.to_date)) }
-          *
-    %data.dt-published{ value: status.created_at.to_time.iso8601 }
-
-    .p-author.h-card
-      = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener noreferrer' do
-        .status__avatar
-          %div
-            - if prefers_autoplay?
-              = image_tag status.account.avatar_original_url, alt: '', class: 'u-photo account__avatar'
-            - else
-              = image_tag status.account.avatar_static_url, alt: '', class: 'u-photo account__avatar'
-        %span.display-name
-          %bdi
-            %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: prefers_autoplay?)
-          &nbsp;
-          %span.display-name__account
-            = acct(status.account)
-            = material_symbol('lock') if status.account.locked?
-  .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
-    - if status.spoiler_text?
-      %p<
-        %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}&nbsp;
-        %button.status__content__spoiler-link= t('statuses.show_more')
-    .e-content{ lang: status.language }
-      = prerender_custom_emojis(status_content_format(status), status.emojis)
-
-      - if status.preloadable_poll
-        = render_poll_component(status)
-
-  - if !status.ordered_media_attachments.empty?
-    - if status.ordered_media_attachments.first.video?
-      = render_video_component(status, width: 610, height: 343)
-    - elsif status.ordered_media_attachments.first.audio?
-      = render_audio_component(status, width: 610, height: 343)
-    - else
-      = render_media_gallery_component(status, height: 343)
-  - elsif status.preview_card
-    = render_card_component(status)
-
-  - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id && !hide_show_thread
-    = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do
-      = t 'statuses.show_thread'
-
-  .status__action-bar
-    %span.status__action-bar-button.icon-button.icon-button--with-counter
-      - if status.in_reply_to_id.nil?
-        = material_symbol 'reply'
-      - else
-        = material_symbol 'reply_all'
-      %span.icon-button__counter= obscured_counter status.replies_count
-    %span.status__action-bar-button.icon-button
-      - if status.distributable?
-        = material_symbol 'repeat'
-      - elsif status.private_visibility? || status.limited_visibility?
-        = material_symbol 'lock'
-      - else
-        = material_symbol 'alternate_email'
-    %span.status__action-bar-button.icon-button
-      = material_symbol 'star'
diff --git a/app/views/statuses/_status.html.haml b/app/views/statuses/_status.html.haml
deleted file mode 100644
index bf51b5ff7d..0000000000
--- a/app/views/statuses/_status.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-.entry
-  = render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, hide_show_thread: false
diff --git a/app/views/statuses/embed.html.haml b/app/views/statuses/embed.html.haml
index 18d62fd8e3..09d0792ea2 100644
--- a/app/views/statuses/embed.html.haml
+++ b/app/views/statuses/embed.html.haml
@@ -1,2 +1 @@
-.activity-stream.activity-stream--headless
-  = render 'status', status: @status, centered: true
+#mastodon-status{ data: { props: Oj.dump(default_props.merge(id: @status.id.to_s)) } }
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 648ec6091d..89ede096e2 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -6,7 +6,6 @@ af:
     hosted_on: Mastodon gehuisves op %{domain}
     title: Aangaande
   accounts:
-    follow: Volg
     followers:
       one: Volgeling
       other: Volgelinge
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 41eeee4614..589bb39836 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -7,7 +7,6 @@ an:
     hosted_on: Mastodon alochau en %{domain}
     title: Sobre
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1410,23 +1409,12 @@ an:
     edited_at_html: Editau %{date}
     errors:
       in_reply_not_found: Lo estau a lo qual intentas responder no existe.
-    open_in_web: Ubrir en web
     over_character_limit: Limite de caracters de %{max} superau
     pin_errors:
       direct: Las publicacions que son visibles solo pa los usuarios mencionaus no pueden fixar-se
       limit: Ya has fixau lo numero maximo de publicacions
       ownership: La publicación d'unatra persona no puede fixar-se
       reblog: Un boost no puede fixar-se
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} chent"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Vota
-    show_more: Amostrar mas
-    show_thread: Amostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Directa
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 06cea7ecb3..480feeba2d 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -7,7 +7,6 @@ ar:
     hosted_on: ماستدون مُستضاف على %{domain}
     title: عن
   accounts:
-    follow: متابَعة
     followers:
       few: متابِعون
       many: متابِعون
@@ -1772,31 +1771,12 @@ ar:
     edited_at_html: عُدّل في %{date}
     errors:
       in_reply_not_found: إنّ المنشور الذي تحاول الرد عليه غير موجود على ما يبدو.
-    open_in_web: افتح في الويب
     over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
     pin_errors:
       direct: لا يمكن تثبيت المنشورات التي يراها فقط المتسخدمون المشار إليهم
       limit: لقد بلغت الحد الأقصى للمنشورات المثبتة
       ownership: لا يمكن تثبيت منشور نشره شخص آخر
       reblog: لا يمكن تثبيت إعادة نشر
-    poll:
-      total_people:
-        few: "%{count} أشخاص"
-        many: "%{count} أشخاص"
-        one: "%{count} شخص واحد"
-        other: "%{count} شخصا"
-        two: "%{count} شخصين"
-        zero: "%{count} شخص"
-      total_votes:
-        few: "%{count} أصوات"
-        many: "%{count} أصوات"
-        one: صوت واحد %{count}
-        other: "%{count} صوتا"
-        two: صوتين %{count}
-        zero: بدون صوت %{count}
-      vote: صوّت
-    show_more: أظهر المزيد
-    show_thread: اعرض خيط المحادثة
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: مباشرة
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 70a0ad3bdd..be3441507e 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -800,20 +800,11 @@ ast:
     default_language: La mesma que la de la interfaz
     errors:
       in_reply_not_found: L'artículu al que tentes de responder paez que nun esiste.
-    open_in_web: Abrir na web
     pin_errors:
       direct: Nun se puen fixar los artículos que son visibles namás pa los usuarios mentaos
       limit: Yá fixesti'l númberu máximu d'artículos
       ownership: Nun se pue fixar l'artículu d'otru perfil
       reblog: Nun se pue fixar un artículu compartíu
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} persones"
-      total_votes:
-        one: "%{count} votu"
-        other: "%{count} votos"
-    show_more: Amosar más
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Mensaxe direutu
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 31a31e9e61..48ca5751cc 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -7,7 +7,6 @@ be:
     hosted_on: Mastodon месціцца на %{domain}
     title: Пра нас
   accounts:
-    follow: Падпісацца
     followers:
       few: Падпісчыка
       many: Падпісчыкаў
@@ -1778,27 +1777,12 @@ be:
     edited_at_html: Адрэдагавана %{date}
     errors:
       in_reply_not_found: Здаецца, допіс, на які вы спрабуеце адказаць, не існуе.
-    open_in_web: Адчыніць у вэб-версіі
     over_character_limit: перавышаная колькасць сімвалаў у %{max}
     pin_errors:
       direct: Допісы, бачныя толькі згаданым карыстальнікам, не могуць быць замацаваныя
       limit: Вы ўжо замацавалі максімальную колькасць допісаў
       ownership: Немагчыма замацаваць чужы допіс
       reblog: Немагчыма замацаваць пашырэнне
-    poll:
-      total_people:
-        few: "%{count} чалавекі"
-        many: "%{count} чалавек"
-        one: "%{count} чалавек"
-        other: "%{count} чалавека"
-      total_votes:
-        few: "%{count} галасы"
-        many: "%{count} галасоў"
-        one: "%{count} голас"
-        other: "%{count} голасу"
-      vote: Прагаласаваць
-    show_more: Паказаць больш
-    show_thread: Паказаць ланцуг
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Асабіста
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 42a626c695..604eeca480 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -7,7 +7,6 @@ bg:
     hosted_on: Mastodon е разположен на хост %{domain}
     title: Относно
   accounts:
-    follow: Последване
     followers:
       one: Последовател
       other: Последователи
@@ -1664,23 +1663,12 @@ bg:
     edited_at_html: Редактирано на %{date}
     errors:
       in_reply_not_found: Изглежда, че публикацията, на която се опитвате да отговорите, не съществува.
-    open_in_web: Отвори в уеб
     over_character_limit: прехвърлен лимит от %{max} символа
     pin_errors:
       direct: Публикациите, които са видими само за потребители споменати в тях, не могат да бъдат закачани
       limit: Вече сте закачили максималния брой публикации
       ownership: Публикация на някого другиго не може да бъде закачена
       reblog: Раздуване не може да бъде закачано
-    poll:
-      total_people:
-        one: "%{count} човек"
-        other: "%{count} души"
-      total_votes:
-        one: "%{count} глас"
-        other: "%{count} гласа"
-      vote: Гласуване
-    show_more: Покажи повече
-    show_thread: Показване на нишката
     title: "%{name}: „%{quote}“"
     visibilities:
       direct: Директно
diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index edbef73ae2..74ff25d754 100644
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -7,7 +7,6 @@ bn:
     hosted_on: এই মাস্টাডনটি আছে %{domain} এ
     title: পরিচিতি
   accounts:
-    follow: যুক্ত
     followers:
       one: যুক্ত আছে
       other: যারা যুক্ত হয়েছে
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 4ef8fa1a18..f9fbd34adb 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -6,7 +6,6 @@ br:
     hosted_on: Servijer Mastodon herberc'hiet war %{domain}
     title: Diwar-benn
   accounts:
-    follow: Heuliañ
     followers:
       few: Heulier·ez
       many: Heulier·ez
@@ -519,9 +518,6 @@ br:
         two: "%{count} skeudenn"
     pin_errors:
       ownership: N'hallit ket spilhennañ embannadurioù ar re all
-    poll:
-      vote: Mouezhiañ
-    show_more: Diskouez muioc'h
     visibilities:
       direct: War-eeun
       public: Publik
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 63654ae708..d985a2ac42 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -7,7 +7,6 @@ ca:
     hosted_on: Mastodon allotjat a %{domain}
     title: Quant a
   accounts:
-    follow: Segueix
     followers:
       one: Seguidor
       other: Seguidors
@@ -1734,23 +1733,12 @@ ca:
     edited_at_html: Editat %{date}
     errors:
       in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
-    open_in_web: Obre en la web
     over_character_limit: Límit de caràcters de %{max} superat
     pin_errors:
       direct: Els tuts que només són visibles per als usuaris mencionats no poden ser fixats
       limit: Ja has fixat el màxim nombre de tuts
       ownership: No es pot fixar el tut d'algú altre
       reblog: No es pot fixar un impuls
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} persones"
-      total_votes:
-        one: "%{count} vot"
-        other: "%{count} vots"
-      vote: Vota
-    show_more: Mostra'n més
-    show_thread: Mostra el fil
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Directe
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 3ecef4bb4d..8af3d86388 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -7,7 +7,6 @@ ckb:
     hosted_on: مەستودۆن میوانداری کراوە لە %{domain}
     title: دەربارە
   accounts:
-    follow: شوێن کەوە
     followers:
       one: شوێنکەوتوو
       other: شوێن‌کەوتووان
@@ -938,22 +937,11 @@ ckb:
       other: 'هاشتاگەکانی ڕێگەپێنەدراوەی تێدابوو: %{tags}'
     errors:
       in_reply_not_found: ئەو دۆخەی کە تۆ هەوڵی وەڵامدانەوەی دەدەیت وادەرناکەوێت کە هەبێت.
-    open_in_web: کردنەوە لە وێب
     over_character_limit: سنووری نووسەی %{max} تێپەڕێنرا
     pin_errors:
       limit: تۆ پێشتر زۆرترین ژمارەی توتتی چەسپیوەت هەیە
       ownership: نووسراوەکانی تر ناتوانرێ بسەلمێت
       reblog: بەهێزکردن ناتوانرێت بچەسپێ
-    poll:
-      total_people:
-        one: "%{count} کەس"
-        other: "%{count} خەڵک"
-      total_votes:
-        one: "%{count} دەنگ"
-        other: "%{count} دەنگەکان"
-      vote: دەنگ
-    show_more: زیاتر پیشان بدە
-    show_thread: نیشاندانی ڕشتە
     visibilities:
       private: شوێنکەوتوانی تەنها
       private_long: تەنها بۆ شوێنکەوتوانی پیشان بدە
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 7c0695a770..b072e5e4ef 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -6,7 +6,6 @@ co:
     contact_unavailable: Micca dispunibule
     hosted_on: Mastodon allughjatu nant’à %{domain}
   accounts:
-    follow: Siguità
     followers:
       one: Abbunatu·a
       other: Abbunati
@@ -922,22 +921,11 @@ co:
       other: 'cuntene l’hashtag disattivati: %{tags}'
     errors:
       in_reply_not_found: U statutu à quellu avete pruvatu di risponde ùn sembra micca esiste.
-    open_in_web: Apre nant’à u web
     over_character_limit: site sopr’à a limita di %{max} caratteri
     pin_errors:
       limit: Avete digià puntarulatu u numeru massimale di statuti
       ownership: Pudete puntarulà solu unu di i vostri propii statuti
       reblog: Ùn pudete micca puntarulà una spartera
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} persone"
-      total_votes:
-        one: "%{count} votu"
-        other: "%{count} voti"
-      vote: Vutà
-    show_more: Vede di più
-    show_thread: Vede u filu
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direttu
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 7d4d2296ca..1000442870 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -7,7 +7,6 @@ cs:
     hosted_on: Mastodon na doméně %{domain}
     title: O aplikaci
   accounts:
-    follow: Sledovat
     followers:
       few: Sledující
       many: Sledujících
@@ -1721,27 +1720,12 @@ cs:
     edited_at_html: Upraven %{date}
     errors:
       in_reply_not_found: Příspěvek, na který se pokoušíte odpovědět, neexistuje.
-    open_in_web: Otevřít na webu
     over_character_limit: byl překročen limit %{max} znaků
     pin_errors:
       direct: Příspěvky viditelné pouze zmíněným uživatelům nelze připnout
       limit: Už jste si připnuli maximální počet příspěvků
       ownership: Nelze připnout příspěvek někoho jiného
       reblog: Boosty nelze připnout
-    poll:
-      total_people:
-        few: "%{count} lidé"
-        many: "%{count} lidí"
-        one: "%{count} člověk"
-        other: "%{count} lidí"
-      total_votes:
-        few: "%{count} hlasy"
-        many: "%{count} hlasů"
-        one: "%{count} hlas"
-        other: "%{count} hlasů"
-      vote: Hlasovat
-    show_more: Zobrazit více
-    show_thread: Zobrazit vlákno
     title: "%{name}: „%{quote}“"
     visibilities:
       direct: Přímé
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 2e425bb497..9d3c0c82f3 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -7,7 +7,6 @@ cy:
     hosted_on: Mastodon wedi ei weinyddu ar %{domain}
     title: Ynghylch
   accounts:
-    follow: Dilyn
     followers:
       few: Dilynwyr
       many: Dilynwyr
@@ -1860,31 +1859,12 @@ cy:
     edited_at_html: Wedi'i olygu %{date}
     errors:
       in_reply_not_found: Nid yw'n ymddangos bod y postiad rydych chi'n ceisio ei ateb yn bodoli.
-    open_in_web: Agor yn y we
     over_character_limit: wedi mynd y tu hwnt i'r terfyn nodau o %{max}
     pin_errors:
       direct: Nid oes modd pinio postiadau sy'n weladwy i ddefnyddwyr a grybwyllwyd yn unig
       limit: Rydych chi eisoes wedi pinio uchafswm nifer y postiadau
       ownership: Nid oes modd pinio postiad rhywun arall
       reblog: Nid oes modd pinio hwb
-    poll:
-      total_people:
-        few: "%{count} person"
-        many: "%{count} person"
-        one: "%{count} berson"
-        other: "%{count} person"
-        two: "%{count} person"
-        zero: "%{count} o bersonau"
-      total_votes:
-        few: "%{count} pleidlais"
-        many: "%{count} pleidlais"
-        one: "%{count} bleidlais"
-        other: "%{count} pleidlais"
-        two: "%{count} pleidlais"
-        zero: "%{count} o bleidleisiau"
-      vote: Pleidlais
-    show_more: Dangos mwy
-    show_thread: Dangos edefyn
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Uniongyrchol
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 731c1f0b40..6f781742a8 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -7,7 +7,6 @@ da:
     hosted_on: Mastodon hostet på %{domain}
     title: Om
   accounts:
-    follow: Følg
     followers:
       one: Følger
       other: tilhængere
@@ -1740,23 +1739,12 @@ da:
     edited_at_html: Redigeret %{date}
     errors:
       in_reply_not_found: Indlægget, der forsøges besvaret, ser ikke ud til at eksistere.
-    open_in_web: Åbn i webbrowser
     over_character_limit: grænsen på %{max} tegn overskredet
     pin_errors:
       direct: Indlæg, som kun kan ses af omtalte brugere, kan ikke fastgøres
       limit: Maksimalt antal indlæg allerede fastgjort
       ownership: Andres indlæg kan ikke fastgøres
       reblog: Et boost kan ikke fastgøres
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} personer"
-      total_votes:
-        one: "%{count} stemme"
-        other: "%{count} stemmer"
-      vote: Stem
-    show_more: Vis flere
-    show_thread: Vis tråd
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direkte
diff --git a/config/locales/de.yml b/config/locales/de.yml
index cc049c5903..040ddaaf69 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -7,7 +7,6 @@ de:
     hosted_on: Mastodon, gehostet auf %{domain}
     title: Über
   accounts:
-    follow: Folgen
     followers:
       one: Follower
       other: Follower
@@ -1740,23 +1739,12 @@ de:
     edited_at_html: 'Bearbeitet: %{date}'
     errors:
       in_reply_not_found: Der Beitrag, auf den du antworten möchtest, scheint nicht zu existieren.
-    open_in_web: Im Webinterface öffnen
     over_character_limit: Begrenzung von %{max} Zeichen überschritten
     pin_errors:
       direct: Beiträge, die nur für erwähnte Profile sichtbar sind, können nicht angeheftet werden
       limit: Du hast bereits die maximale Anzahl an Beiträgen angeheftet
       ownership: Du kannst nur eigene Beiträge anheften
       reblog: Du kannst keine geteilten Beiträge anheften
-    poll:
-      total_people:
-        one: "%{count} Stimme"
-        other: "%{count} Stimmen"
-      total_votes:
-        one: "%{count} Stimme"
-        other: "%{count} Stimmen"
-      vote: Abstimmen
-    show_more: Mehr anzeigen
-    show_thread: Thread anzeigen
     title: "%{name}: „%{quote}“"
     visibilities:
       direct: Direktnachricht
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 3cb9075c38..1f408e26ea 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -7,7 +7,6 @@ el:
     hosted_on: Το Mastodon φιλοξενείται στο %{domain}
     title: Σχετικά
   accounts:
-    follow: Ακολούθησε
     followers:
       one: Ακόλουθος
       other: Ακόλουθοι
@@ -1636,23 +1635,12 @@ el:
     edited_at_html: Επεξεργάστηκε στις %{date}
     errors:
       in_reply_not_found: Η ανάρτηση στην οποία προσπαθείς να απαντήσεις δεν φαίνεται να υπάρχει.
-    open_in_web: Άνοιγμα στο διαδίκτυο
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
     pin_errors:
       direct: Αναρτήσεις που είναι ορατές μόνο στους αναφερόμενους χρήστες δεν μπορούν να καρφιτσωθούν
       limit: Έχεις ήδη καρφιτσώσει το μέγιστο αριθμό επιτρεπτών αναρτήσεων
       ownership: Δεν μπορείς να καρφιτσώσεις ανάρτηση κάποιου άλλου
       reblog: Οι ενισχύσεις δεν καρφιτσώνονται
-    poll:
-      total_people:
-        one: "%{count} άτομο"
-        other: "%{count} άτομα"
-      total_votes:
-        one: "%{count} ψήφος"
-        other: "%{count} ψήφοι"
-      vote: Ψήφισε
-    show_more: Δείξε περισσότερα
-    show_thread: Εμφάνιση νήματος
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Άμεση
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index dc07dcff0b..56255f5d7a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -7,7 +7,6 @@ en-GB:
     hosted_on: Mastodon hosted on %{domain}
     title: About
   accounts:
-    follow: Follow
     followers:
       one: Follower
       other: Followers
@@ -1740,23 +1739,12 @@ en-GB:
     edited_at_html: Edited %{date}
     errors:
       in_reply_not_found: The post you are trying to reply to does not appear to exist.
-    open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors:
       direct: Posts that are only visible to mentioned users cannot be pinned
       limit: You have already pinned the maximum number of posts
       ownership: Someone else's post cannot be pinned
       reblog: A boost cannot be pinned
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} people"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Vote
-    show_more: Show more
-    show_thread: Show thread
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direct
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 05300acea5..b1c100da0c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,7 +7,6 @@ en:
     hosted_on: Mastodon hosted on %{domain}
     title: About
   accounts:
-    follow: Follow
     followers:
       one: Follower
       other: Followers
@@ -1741,23 +1740,12 @@ en:
     edited_at_html: Edited %{date}
     errors:
       in_reply_not_found: The post you are trying to reply to does not appear to exist.
-    open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors:
       direct: Posts that are only visible to mentioned users cannot be pinned
       limit: You have already pinned the maximum number of posts
       ownership: Someone else's post cannot be pinned
       reblog: A boost cannot be pinned
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} people"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Vote
-    show_more: Show more
-    show_thread: Show thread
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direct
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c1873c2f24..46c6cbcf86 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -7,7 +7,6 @@ eo:
     hosted_on: "%{domain} estas nodo de Mastodon"
     title: Pri
   accounts:
-    follow: Sekvi
     followers:
       one: Sekvanto
       other: Sekvantoj
@@ -1553,23 +1552,12 @@ eo:
     edited_at_html: Redaktis je %{date}
     errors:
       in_reply_not_found: Mesaĝo kiun vi provas respondi ŝajnas ne ekzisti.
-    open_in_web: Malfermi retumile
     over_character_limit: limo de %{max} signoj transpasita
     pin_errors:
       direct: Mesaĝoj kiu videbla nun al la uzantoj ne povas alpinglitis
       limit: Vi jam atingis la maksimuman nombron de alpinglitaj mesaĝoj
       ownership: Mesaĝo de iu alia ne povas esti alpinglita
       reblog: Diskonigo ne povas esti alpinglita
-    poll:
-      total_people:
-        one: "%{count} persono"
-        other: "%{count} personoj"
-      total_votes:
-        one: "%{count} voĉdono"
-        other: "%{count} voĉdonoj"
-      vote: Voĉdoni
-    show_more: Montri pli
-    show_thread: Montri la mesaĝaron
     title: "%{name}: “%{quote}”"
     visibilities:
       direct: Rekta
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 63d2adc47c..4d60d080a2 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -7,7 +7,6 @@ es-AR:
     hosted_on: Mastodon alojado en %{domain}
     title: Información
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1740,23 +1739,12 @@ es-AR:
     edited_at_html: Editado el %{date}
     errors:
       in_reply_not_found: El mensaje al que intentás responder no existe.
-    open_in_web: Abrir en la web
     over_character_limit: se excedió el límite de %{max} caracteres
     pin_errors:
       direct: Los mensajes que sólo son visibles para los usuarios mencionados no pueden ser fijados
       limit: Ya fijaste el número máximo de mensajes
       ownership: No se puede fijar el mensaje de otra cuenta
       reblog: No se puede fijar una adhesión
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Votar
-    show_more: Mostrar más
-    show_thread: Mostrar hilo
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Directo
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 84663aa895..050388c180 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -7,7 +7,6 @@ es-MX:
     hosted_on: Mastodon alojado en %{domain}
     title: Acerca de
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1730,23 +1729,12 @@ es-MX:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: El estado al que intentas responder no existe.
-    open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
       direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
       limit: Ya has fijado el número máximo de publicaciones
       ownership: El toot de alguien más no puede fijarse
       reblog: Un boost no puede fijarse
-    poll:
-      total_people:
-        one: persona %{count}
-        other: "%{count} gente"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Vota
-    show_more: Mostrar más
-    show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Directa
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e245dde5d6..81a547ad88 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -7,7 +7,6 @@ es:
     hosted_on: Mastodon alojado en %{domain}
     title: Acerca de
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1730,23 +1729,12 @@ es:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: La publicación a la que intentas responder no existe.
-    open_in_web: Abrir en web
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
       direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
       limit: Ya has fijado el número máximo de publicaciones
       ownership: La publicación de otra persona no puede fijarse
       reblog: Un boost no puede fijarse
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Vota
-    show_more: Mostrar más
-    show_thread: Mostrar discusión
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Directa
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 88d48fefcb..d8cdbf4143 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -7,7 +7,6 @@ et:
     hosted_on: Mastodon majutatud %{domain}-is
     title: Teave
   accounts:
-    follow: Jälgi
     followers:
       one: Jälgija
       other: Jälgijaid
@@ -1701,23 +1700,12 @@ et:
     edited_at_html: Muudetud %{date}
     errors:
       in_reply_not_found: Postitus, millele üritad vastata, ei näi enam eksisteerivat.
-    open_in_web: Ava veebis
     over_character_limit: tähtmärkide limiit %{max} ületatud
     pin_errors:
       direct: Ei saa kinnitada postitusi, mis on nähtavad vaid mainitud kasutajatele
       limit: Kinnitatud on juba maksimaalne arv postitusi
       ownership: Kellegi teise postitust ei saa kinnitada
       reblog: Jagamist ei saa kinnitada
-    poll:
-      total_people:
-        one: "%{count} inimene"
-        other: "%{count} inimest"
-      total_votes:
-        one: "%{count} hääl"
-        other: "%{count} häält"
-      vote: Hääleta
-    show_more: Näita rohkem
-    show_thread: Kuva lõim
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Otsene
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e5ae0ab79d..6260033990 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -7,7 +7,6 @@ eu:
     hosted_on: Mastodon %{domain} domeinuan ostatatua
     title: Honi buruz
   accounts:
-    follow: Jarraitu
     followers:
       one: Jarraitzaile
       other: jarraitzaile
@@ -1639,23 +1638,12 @@ eu:
     edited_at_html: Editatua %{date}
     errors:
       in_reply_not_found: Erantzuten saiatu zaren bidalketa antza ez da existitzen.
-    open_in_web: Ireki web-ean
     over_character_limit: "%{max}eko karaktere muga gaindituta"
     pin_errors:
       direct: Aipatutako erabiltzaileentzat soilik ikusgai dauden bidalketak ezin dira finkatu
       limit: Gehienez finkatu daitekeen bidalketa kopurua finkatu duzu jada
       ownership: Ezin duzu beste norbaiten bidalketa bat finkatu
       reblog: Bultzada bat ezin da finkatu
-    poll:
-      total_people:
-        one: pertsona %{count}
-        other: "%{count} pertsona"
-      total_votes:
-        one: Boto %{count}
-        other: "%{count} boto"
-      vote: Bozkatu
-    show_more: Erakutsi gehiago
-    show_thread: Erakutsi haria
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Zuzena
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ce8a61e3f0..f2fe134e32 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -7,7 +7,6 @@ fa:
     hosted_on: ماستودون، میزبانی‌شده روی %{domain}
     title: درباره
   accounts:
-    follow: پیگیری
     followers:
       one: پیگیر
       other: پیگیر
@@ -1404,23 +1403,12 @@ fa:
     edited_at_html: ویراسته در %{date}
     errors:
       in_reply_not_found: به نظر نمی‌رسد وضعیتی که می‌خواهید به آن پاسخ دهید، وجود داشته باشد.
-    open_in_web: گشودن در وب
     over_character_limit: از حد مجاز %{max} حرف فراتر رفتید
     pin_errors:
       direct: فرسته‌هایی که فقط برای کاربران اشاره شده نمایانند نمی‌توانند سنجاق شوند
       limit: از این بیشتر نمی‌شود نوشته‌های ثابت داشت
       ownership: نوشته‌های دیگران را نمی‌توان ثابت کرد
       reblog: تقویت نمی‌تواند سنجاق شود
-    poll:
-      total_people:
-        one: "%{count} نفر"
-        other: "%{count} نفر"
-      total_votes:
-        one: "%{count} رأی"
-        other: "%{count} رأی"
-      vote: رأی
-    show_more: نمایش
-    show_thread: نمایش رشته
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: مستقیم
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 5c39346a9f..30837b6003 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -7,7 +7,6 @@ fi:
     hosted_on: Mastodon palvelimella %{domain}
     title: Tietoja
   accounts:
-    follow: Seuraa
     followers:
       one: seuraaja
       other: seuraajaa
@@ -1738,23 +1737,12 @@ fi:
     edited_at_html: Muokattu %{date}
     errors:
       in_reply_not_found: Julkaisua, johon yrität vastata, ei näytä olevan olemassa.
-    open_in_web: Avaa selaimessa
     over_character_limit: merkkimäärän rajoitus %{max} ylitetty
     pin_errors:
       direct: Vain mainituille käyttäjille näkyviä julkaisuja ei voi kiinnittää
       limit: Olet jo kiinnittänyt enimmäismäärän julkaisuja
       ownership: Muiden julkaisuja ei voi kiinnittää
       reblog: Tehostusta ei voi kiinnittää
-    poll:
-      total_people:
-        one: "%{count} käyttäjä"
-        other: "%{count} käyttäjää"
-      total_votes:
-        one: "%{count} ääni"
-        other: "%{count} ääntä"
-      vote: Äänestä
-    show_more: Näytä lisää
-    show_thread: Näytä ketju
     title: "%{name}: ”%{quote}”"
     visibilities:
       direct: Suoraan
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 6d7b38e18a..d5127b4ad3 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -7,7 +7,6 @@ fo:
     hosted_on: Mastodon hýst á %{domain}
     title: Um
   accounts:
-    follow: Fylg
     followers:
       one: Fylgjari
       other: Fylgjarar
@@ -1740,23 +1739,12 @@ fo:
     edited_at_html: Rættað %{date}
     errors:
       in_reply_not_found: Posturin, sum tú roynir at svara, sýnist ikki at finnast.
-    open_in_web: Lat upp á vevinum
     over_character_limit: mesta tal av teknum, %{max}, rokkið
     pin_errors:
       direct: Postar, sum einans eru sjónligir hjá nevndum brúkarum, kunnu ikki festast
       limit: Tú hevur longu fest loyvda talið av postum
       ownership: Postar hjá øðrum kunnu ikki festast
       reblog: Ein stimbran kann ikki festast
-    poll:
-      total_people:
-        one: "%{count} fólk"
-        other: "%{count} fólk"
-      total_votes:
-        one: "%{count} atkvøða"
-        other: "%{count} atkvøður"
-      vote: Atkvøð
-    show_more: Vís meira
-    show_thread: Vís tráð
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Beinleiðis
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 27e09d1f9c..a47d7447a1 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -7,7 +7,6 @@ fr-CA:
     hosted_on: Serveur Mastodon hébergé sur %{domain}
     title: À propos
   accounts:
-    follow: Suivre
     followers:
       one: Abonné·e
       other: Abonné·e·s
@@ -1711,23 +1710,12 @@ fr-CA:
     edited_at_html: Édité le %{date}
     errors:
       in_reply_not_found: Le message auquel vous essayez de répondre ne semble pas exister.
-    open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
     pin_errors:
       direct: Les messages qui ne sont visibles que pour les utilisateur·rice·s mentionné·e·s ne peuvent pas être épinglés
       limit: Vous avez déjà épinglé le nombre maximum de messages
       ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
-    poll:
-      total_people:
-        one: "%{count} personne"
-        other: "%{count} personnes"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Voter
-    show_more: Déplier
-    show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
       direct: Direct
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 055b50900c..b2c692ea6f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -7,7 +7,6 @@ fr:
     hosted_on: Serveur Mastodon hébergé sur %{domain}
     title: À propos
   accounts:
-    follow: Suivre
     followers:
       one: Abonné·e
       other: Abonné·e·s
@@ -1711,23 +1710,12 @@ fr:
     edited_at_html: Modifié le %{date}
     errors:
       in_reply_not_found: Le message auquel vous essayez de répondre ne semble pas exister.
-    open_in_web: Ouvrir sur le web
     over_character_limit: limite de %{max} caractères dépassée
     pin_errors:
       direct: Les messages qui ne sont visibles que pour les utilisateur·rice·s mentionné·e·s ne peuvent pas être épinglés
       limit: Vous avez déjà épinglé le nombre maximum de messages
       ownership: Vous ne pouvez pas épingler un message ne vous appartenant pas
       reblog: Un partage ne peut pas être épinglé
-    poll:
-      total_people:
-        one: "%{count} personne"
-        other: "%{count} personnes"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Voter
-    show_more: Déplier
-    show_thread: Afficher le fil de discussion
     title: "%{name} : « %{quote} »"
     visibilities:
       direct: Direct
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 27fcaf3af7..6afdecd556 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -7,7 +7,6 @@ fy:
     hosted_on: Mastodon op %{domain}
     title: Oer
   accounts:
-    follow: Folgje
     followers:
       one: Folger
       other: Folgers
@@ -1730,23 +1729,12 @@ fy:
     edited_at_html: Bewurke op %{date}
     errors:
       in_reply_not_found: It berjocht wêrop jo probearje te reagearjen liket net te bestean.
-    open_in_web: Yn de webapp iepenje
     over_character_limit: Oer de limyt fan %{max} tekens
     pin_errors:
       direct: Berjochten dy’t allinnich sichtber binne foar fermelde brûkers kinne net fêstset wurde
       limit: Jo hawwe it maksimaal tal berjochten al fêstmakke
       ownership: In berjocht fan in oar kin net fêstmakke wurde
       reblog: In boost kin net fêstset wurde
-    poll:
-      total_people:
-        one: "%{count} persoan"
-        other: "%{count} persoanen"
-      total_votes:
-        one: "%{count} stim"
-        other: "%{count} stimmen"
-      vote: Stimme
-    show_more: Mear toane
-    show_thread: Petear toane
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direkt
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 870f79cba9..09d5f7ae18 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -7,7 +7,6 @@ ga:
     hosted_on: Mastodon arna óstáil ar %{domain}
     title: Maidir le
   accounts:
-    follow: Lean
     followers:
       few: Leantóirí
       many: Leantóirí
@@ -1823,29 +1822,12 @@ ga:
     edited_at_html: "%{date} curtha in eagar"
     errors:
       in_reply_not_found: Is cosúil nach ann don phostáil a bhfuil tú ag iarraidh freagra a thabhairt air.
-    open_in_web: Oscail i ngréasán
     over_character_limit: teorainn carachtar %{max} sáraithe
     pin_errors:
       direct: Ní féidir postálacha nach bhfuil le feiceáil ach ag úsáideoirí luaite a phinnáil
       limit: Tá uaslíon na bpostálacha pinn agat cheana féin
       ownership: Ní féidir postáil duine éigin eile a phionnáil
       reblog: Ní féidir treisiú a phinnáil
-    poll:
-      total_people:
-        few: "%{count} daoine"
-        many: "%{count} daoine"
-        one: "%{count} duine"
-        other: "%{count} daoine"
-        two: "%{count} daoine"
-      total_votes:
-        few: "%{count} vótaí"
-        many: "%{count} vótaí"
-        one: "%{count} vóta"
-        other: "%{count} vótaí"
-        two: "%{count} vótaí"
-      vote: Vótáil
-    show_more: Taispeáin níos mó
-    show_thread: Taispeáin snáithe
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Díreach
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index dda918d15c..3f30d37823 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -7,7 +7,6 @@ gd:
     hosted_on: Mastodon ’ga òstadh air %{domain}
     title: Mu dhèidhinn
   accounts:
-    follow: Lean
     followers:
       few: Luchd-leantainn
       one: Neach-leantainn
@@ -1793,27 +1792,12 @@ gd:
     edited_at_html: Air a dheasachadh %{date}
     errors:
       in_reply_not_found: Tha coltas nach eil am post dhan a tha thu airson freagairt ann.
-    open_in_web: Fosgail air an lìon
     over_character_limit: chaidh thu thar crìoch charactaran de %{max}
     pin_errors:
       direct: Chan urrainn dhut post a phrìneachadh nach fhaic ach na cleachdaichean le iomradh orra
       limit: Tha an àireamh as motha de phostaichean prìnichte agad a tha ceadaichte
       ownership: Chan urrainn dhut post càich a phrìneachadh
       reblog: Chan urrainn dhut brosnachadh a phrìneachadh
-    poll:
-      total_people:
-        few: "%{count} daoine"
-        one: "%{count} neach"
-        other: "%{count} duine"
-        two: "%{count} neach"
-      total_votes:
-        few: "%{count} bhòtaichean"
-        one: "%{count} bhòt"
-        other: "%{count} bhòt"
-        two: "%{count} bhòt"
-      vote: Bhòt
-    show_more: Seall barrachd dheth
-    show_thread: Seall an snàithlean
     title: "%{name}: “%{quote}”"
     visibilities:
       direct: Dìreach
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d275b844fd..58fd2d9bab 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -7,7 +7,6 @@ gl:
     hosted_on: Mastodon aloxado en %{domain}
     title: Sobre
   accounts:
-    follow: Seguir
     followers:
       one: Seguidora
       other: Seguidoras
@@ -1740,23 +1739,12 @@ gl:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: A publicación á que tentas responder semella que non existe.
-    open_in_web: Abrir na web
     over_character_limit: Excedeu o límite de caracteres %{max}
     pin_errors:
       direct: As publicacións que só son visibles para as usuarias mencionadas non se poden fixar
       limit: Xa fixaches o número máximo permitido de publicacións
       ownership: Non podes fixar a publicación doutra usuaria
       reblog: Non se poden fixar as mensaxes promovidas
-    poll:
-      total_people:
-        one: "%{count} persoa"
-        other: "%{count} persoas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Votar
-    show_more: Mostrar máis
-    show_thread: Amosar fío
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Directa
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 341e2bf023..7a2d0a1d98 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -7,7 +7,6 @@ he:
     hosted_on: מסטודון שיושב בכתובת %{domain}
     title: אודות
   accounts:
-    follow: לעקוב
     followers:
       many: עוקבים
       one: עוקב
@@ -1800,27 +1799,12 @@ he:
     edited_at_html: נערך ב-%{date}
     errors:
       in_reply_not_found: נראה שההודעה שאת/ה מנסה להגיב לה לא קיימת.
-    open_in_web: פתח ברשת
     over_character_limit: חריגה מגבול התווים של %{max}
     pin_errors:
       direct: לא ניתן לקבע הודעות שנראותן מוגבלת למכותבים בלבד
       limit: הגעת למספר המירבי של ההודעות המוצמדות
       ownership: הודעות של אחרים לא יכולות להיות מוצמדות
       reblog: אין אפשרות להצמיד הדהודים
-    poll:
-      total_people:
-        many: "%{count} אנשים"
-        one: איש/ה %{count}
-        other: "%{count} אנשים"
-        two: "%{count} אנשים"
-      total_votes:
-        many: "%{count} קולות"
-        one: קול %{count}
-        other: "%{count} קולות"
-        two: "%{count} קולות"
-      vote: הצבעה
-    show_more: עוד
-    show_thread: הצג שרשור
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: ישיר
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 60b500c7ec..37df2afe1a 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -5,7 +5,6 @@ hi:
     contact_unavailable: लागू नहीं है
     title: के बारे में
   accounts:
-    follow: अनुसरे
     following: फ़ॉलो कर रहे हैं
     instance_actor_flash: यह खाता आभासी है जो सर्वर को दिखाने के लिये है और ये किसी व्यक्तिका प्रतिनिधित्व नहि करता। यह सिर्फ देखरेख के हेतु से कार्यरत है और इसको निलंबित करने कि आवश्यकता नहि है।
     last_active: आखिरि बार इस वक्त सक्रिय थे
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 6a67ea0129..7dacf20077 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -5,7 +5,6 @@ hr:
     contact_missing: Nije postavljeno
     title: O aplikaciji
   accounts:
-    follow: Prati
     following: Praćenih
     last_active: posljednja aktivnost
     nothing_here: Ovdje nema ničeg!
@@ -215,20 +214,7 @@ hr:
     statuses_cleanup: Automatsko brisanje postova
     two_factor_authentication: Dvofaktorska autentifikacija
   statuses:
-    open_in_web: Otvori na webu
     over_character_limit: prijeđeno je ograničenje od %{max} znakova
-    poll:
-      total_people:
-        few: "%{count} osobe"
-        one: "%{count} osoba"
-        other: "%{count} ljudi"
-      total_votes:
-        few: "%{count} glasa"
-        one: "%{count} glas"
-        other: "%{count} glasova"
-      vote: Glasaj
-    show_more: Prikaži više
-    show_thread: Prikaži nit
     visibilities:
       private: Samo pratitelji
       public: Javno
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e29472f8d8..10c7506b01 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -7,7 +7,6 @@ hu:
     hosted_on: "%{domain} Mastodon-kiszolgáló"
     title: Névjegy
   accounts:
-    follow: Követés
     followers:
       one: Követő
       other: Követő
@@ -1740,23 +1739,12 @@ hu:
     edited_at_html: 'Szerkesztve: %{date}'
     errors:
       in_reply_not_found: Már nem létezik az a bejegyzés, melyre válaszolni szeretnél.
-    open_in_web: Megnyitás a weben
     over_character_limit: túllépted a maximális %{max} karakteres keretet
     pin_errors:
       direct: A csak a megemlített felhasználók számára látható bejegyzések nem tűzhetők ki
       limit: Elérted a kitűzhető bejegyzések maximális számát
       ownership: Nem tűzheted ki valaki más bejegyzését
       reblog: Megtolt bejegyzést nem tudsz kitűzni
-    poll:
-      total_people:
-        one: "%{count} személy"
-        other: "%{count} személy"
-      total_votes:
-        one: "%{count} szavazat"
-        other: "%{count} szavazat"
-      vote: Szavazás
-    show_more: Több megjelenítése
-    show_thread: Szál mutatása
     title: "%{name}: „%{quote}”"
     visibilities:
       direct: Közvetlen
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index c7128a2a46..80dbc77991 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -7,7 +7,6 @@ hy:
     hosted_on: Մաստոդոնը տեղակայուած է %{domain}ում
     title: Մասին
   accounts:
-    follow: Հետևել
     followers:
       one: Հետեւորդ
       other: Հետևորդներ
@@ -782,18 +781,7 @@ hy:
         other: "%{count} վիդեո"
     content_warning: Նախազգուշացում։ %{warning}
     edited_at_html: Խմբագրուած՝ %{date}
-    open_in_web: Բացել վէբում
     over_character_limit: "%{max} նիշի սահմանը գերազանցուած է"
-    poll:
-      total_people:
-        one: "%{count} մարդ"
-        other: "%{count} մարդիկ"
-      total_votes:
-        one: "%{count} ձայն"
-        other: "%{count} ձայներ"
-      vote: Քուէարկել
-    show_more: Աւելին
-    show_thread: Բացել շղթան
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Հասցէագրուած
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 87789562fd..957bae3991 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -7,7 +7,6 @@ ia:
     hosted_on: Mastodon albergate sur %{domain}
     title: A proposito
   accounts:
-    follow: Sequer
     followers:
       one: Sequitor
       other: Sequitores
@@ -1723,23 +1722,12 @@ ia:
     edited_at_html: Modificate le %{date}
     errors:
       in_reply_not_found: Le message a que tu tenta responder non pare exister.
-    open_in_web: Aperir sur le web
     over_character_limit: limite de characteres de %{max} excedite
     pin_errors:
       direct: Messages que es solo visibile a usatores mentionate non pote esser appunctate
       limit: Tu ha jam appunctate le maxime numero de messages
       ownership: Le message de alcuno altere non pote esser appunctate
       reblog: Un impulso non pote esser affixate
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Votar
-    show_more: Monstrar plus
-    show_thread: Monstrar discussion
     title: "%{name}: “%{quote}”"
     visibilities:
       direct: Directe
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 575daddca6..222d2b5680 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -7,7 +7,6 @@ id:
     hosted_on: Mastodon dihosting di %{domain}
     title: Tentang
   accounts:
-    follow: Ikuti
     followers:
       other: Pengikut
     following: Mengikuti
@@ -1378,21 +1377,12 @@ id:
     edited_at_html: Diedit %{date}
     errors:
       in_reply_not_found: Status yang ingin Anda balas sudah tidak ada.
-    open_in_web: Buka di web
     over_character_limit: melebihi %{max} karakter
     pin_errors:
       direct: Kiriman yang hanya terlihat oleh pengguna yang disebutkan tidak dapat disematkan
       limit: Anda sudah mencapai jumlah maksimum kiriman yang dapat disematkan
       ownership: Kiriman orang lain tidak bisa disematkan
       reblog: Boost tidak bisa disematkan
-    poll:
-      total_people:
-        other: "%{count} orang"
-      total_votes:
-        other: "%{count} memilih"
-      vote: Pilih
-    show_more: Tampilkan selengkapnya
-    show_thread: Tampilkan utas
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Langsung
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 1529ea04b8..6a79686f48 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -7,7 +7,6 @@ ie:
     hosted_on: Mastodon logiat che %{domain}
     title: Pri
   accounts:
-    follow: Sequer
     followers:
       one: Sequitor
       other: Sequitores
@@ -1637,23 +1636,12 @@ ie:
     edited_at_html: Modificat ye %{date}
     errors:
       in_reply_not_found: Li posta a quel tu prova responder ne sembla exister.
-    open_in_web: Aperter in web
     over_character_limit: límite de carácteres de %{max} transpassat
     pin_errors:
       direct: On ne posse pinglar postas queles es visibil solmen a mentionat usatores
       limit: Tu ja ha pinglat li maxim númere de postas
       ownership: On ne posse pinglar li posta de un altri person
       reblog: On ne posse pinglar un boost
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} persones"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Votar
-    show_more: Monstrar plu
-    show_thread: Monstrar fil
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Direct
diff --git a/config/locales/io.yml b/config/locales/io.yml
index d1b9aef3e5..dbbe228e72 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -7,7 +7,6 @@ io:
     hosted_on: Mastodon hostigesas che %{domain}
     title: Pri co
   accounts:
-    follow: Sequar
     followers:
       one: Sequanto
       other: Sequanti
@@ -1590,23 +1589,12 @@ io:
     edited_at_html: Modifikesis ye %{date}
     errors:
       in_reply_not_found: Posto quon vu probas respondar semblas ne existas.
-    open_in_web: Apertar retnavigile
     over_character_limit: limito de %{max} signi ecesita
     pin_errors:
       direct: Posti quo povas videsar nur mencionita uzanti ne povas pinglagesar
       limit: Vu ja pinglagis maxima posti
       ownership: Posto di altra persono ne povas pinglagesar
       reblog: Repeto ne povas pinglizesar
-    poll:
-      total_people:
-        one: "%{count} persono"
-        other: "%{count} personi"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} voti"
-      vote: Votez
-    show_more: Montrar plue
-    show_thread: Montrez postaro
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direta
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 5fa147e8db..78dfd6048f 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -7,7 +7,6 @@ is:
     hosted_on: Mastodon hýst á %{domain}
     title: Um hugbúnaðinn
   accounts:
-    follow: Fylgjast með
     followers:
       one: fylgjandi
       other: fylgjendur
@@ -1744,23 +1743,12 @@ is:
     edited_at_html: Breytt %{date}
     errors:
       in_reply_not_found: Færslan sem þú ert að reyna að svara að er líklega ekki til.
-    open_in_web: Opna í vafra
     over_character_limit: hámarksfjölda stafa (%{max}) náð
     pin_errors:
       direct: Ekki er hægt að festa færslur sem einungis eru sýnilegar þeim notendum sem minnst er á
       limit: Þú hefur þegar fest leyfilegan hámarksfjölda færslna
       ownership: Færslur frá einhverjum öðrum er ekki hægt að festa
       reblog: Ekki er hægt að festa endurbirtingu
-    poll:
-      total_people:
-        one: "%{count} aðili"
-        other: "%{count} aðilar"
-      total_votes:
-        one: "%{count} atkvæði"
-        other: "%{count} atkvæði"
-      vote: Greiða atkvæði
-    show_more: Sýna meira
-    show_thread: Birta þráð
     title: "%{name}: „%{quote}‟"
     visibilities:
       direct: Beint
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7de24fe259..792add14e3 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -7,7 +7,6 @@ it:
     hosted_on: Mastodon ospitato su %{domain}
     title: Info
   accounts:
-    follow: Segui
     followers:
       one: Seguace
       other: Seguaci
@@ -1742,23 +1741,12 @@ it:
     edited_at_html: Modificato il %{date}
     errors:
       in_reply_not_found: Il post a cui stai tentando di rispondere non sembra esistere.
-    open_in_web: Apri sul Web
     over_character_limit: Limite caratteri superato di %{max}
     pin_errors:
       direct: I messaggi visibili solo agli utenti citati non possono essere fissati in cima
       limit: Hai già fissato in cima il massimo numero di post
       ownership: Non puoi fissare in cima un post di qualcun altro
       reblog: Un toot condiviso non può essere fissato in cima
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} persone"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} voti"
-      vote: Vota
-    show_more: Mostra di più
-    show_thread: Mostra thread
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Diretto
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3f50b0d7a6..13f59e981b 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -7,7 +7,6 @@ ja:
     hosted_on: Mastodon hosted on %{domain}
     title: このサーバーについて
   accounts:
-    follow: フォロー
     followers:
       other: フォロワー
     following: フォロー中
@@ -1700,21 +1699,12 @@ ja:
     edited_at_html: "%{date} 編集済み"
     errors:
       in_reply_not_found: あなたが返信しようとしている投稿は存在しないようです。
-    open_in_web: Webで開く
     over_character_limit: 上限は%{max}文字です
     pin_errors:
       direct: 返信したユーザーのみに表示される投稿はピン留めできません
       limit: 固定できる投稿数の上限に達しました
       ownership: 他人の投稿を固定することはできません
       reblog: ブーストを固定することはできません
-    poll:
-      total_people:
-        other: "%{count}人"
-      total_votes:
-        other: "%{count}票"
-      vote: 投票
-    show_more: もっと見る
-    show_thread: スレッドを表示
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: ダイレクト
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 97b56ea35c..5769375078 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -6,7 +6,6 @@ ka:
     contact_unavailable: მიუწ.
     hosted_on: მასტოდონს მასპინძლობს %{domain}
   accounts:
-    follow: გაყევი
     following: მიჰყვება
     nothing_here: აქ არაფერია!
     pin_errors:
@@ -430,13 +429,11 @@ ka:
     disallowed_hashtags:
       one: 'მოიცავდა აკრძალულ ჰეშტეგს: %{tags}'
       other: 'მოიცავს აკრძალულ ჰეშტეგს: %{tags}'
-    open_in_web: ვებში გახნსა
     over_character_limit: ნიშნების ლიმიტი გადასცდა %{max}-ს
     pin_errors:
       limit: ტუტების მაქსიმალური რაოდენობა უკვე აპინეთ
       ownership: სხვისი ტუტი ვერ აიპინება
       reblog: ბუსტი ვერ აიპინება
-    show_more: მეტის ჩვენება
     visibilities:
       private: მხოლოდ-მიმდევრები
       private_long: აჩვენე მხოლოდ მიმდევრებს
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 3aed6c55e7..7c3d526702 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -7,7 +7,6 @@ kab:
     hosted_on: Maṣṭudun yersen deg %{domain}
     title: Ɣef
   accounts:
-    follow: Ḍfeṛ
     followers:
       one: Umeḍfaṛ
       other: Imeḍfaṛen
@@ -798,17 +797,6 @@ kab:
         one: "%{count} n tbidyutt"
         other: "%{count} n tbidyutin"
     edited_at_html: Tettwaẓreg ass n %{date}
-    open_in_web: Ldi deg Web
-    poll:
-      total_people:
-        one: "%{count} n wemdan"
-        other: "%{count} n yemdanen"
-      total_votes:
-        one: "%{count} n wedɣar"
-        other: "%{count} n yedɣaren"
-      vote: Dɣeṛ
-    show_more: Ssken-d ugar
-    show_thread: Ssken-d lxiḍ
     title: '%{name} : "%{quote}"'
     visibilities:
       direct: Usrid
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index f89bdee622..67969d4d69 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -6,7 +6,6 @@ kk:
     contact_unavailable: Белгісіз
     hosted_on: Mastodon орнатылған %{domain} доменінде
   accounts:
-    follow: Жазылу
     followers:
       one: Оқырман
       other: Оқырман
@@ -647,22 +646,11 @@ kk:
     disallowed_hashtags:
       one: 'рұқсат етілмеген хэштег: %{tags}'
       other: 'рұқсат етілмеген хэштегтер: %{tags}'
-    open_in_web: Вебте ашу
     over_character_limit: "%{max} максимум таңбадан асып кетті"
     pin_errors:
       limit: Жабыстырылатын жазба саны максимумынан асты
       ownership: Біреудің жазбасы жабыстырылмайды
       reblog: Бөлісілген жазба жабыстырылмайды
-    poll:
-      total_people:
-        one: "%{count} адам"
-        other: "%{count} адам"
-      total_votes:
-        one: "%{count} дауыс"
-        other: "%{count} дауыс"
-      vote: Дауыс беру
-    show_more: Тағы әкел
-    show_thread: Тақырыпты көрсет
     visibilities:
       private: Тек оқырмандарға
       private_long: Тек оқырмандарға ғана көрінеді
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index ab377df304..cbcc09a4da 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -7,7 +7,6 @@ ko:
     hosted_on: "%{domain}에서 호스팅 되는 마스토돈"
     title: 정보
   accounts:
-    follow: 팔로우
     followers:
       other: 팔로워
     following: 팔로잉
@@ -1705,21 +1704,12 @@ ko:
     edited_at_html: "%{date}에 편집됨"
     errors:
       in_reply_not_found: 답장하려는 게시물이 존재하지 않습니다.
-    open_in_web: Web으로 열기
     over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
     pin_errors:
       direct: 멘션된 사용자들에게만 보이는 게시물은 고정될 수 없습니다
       limit: 이미 너무 많은 게시물을 고정했습니다
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
-    poll:
-      total_people:
-        other: "%{count}명"
-      total_votes:
-        other: "%{count} 명 투표함"
-      vote: 투표
-    show_more: 더 보기
-    show_thread: 글타래 보기
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: 다이렉트
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 20fe6cf6de..6b80e32ba8 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -7,7 +7,6 @@ ku:
     hosted_on: Mastodon li ser %{domain} tê pêşkêşkirin
     title: Derbar
   accounts:
-    follow: Bişopîne
     followers:
       one: Şopîner
       other: Şopîner
@@ -1404,23 +1403,12 @@ ku:
     edited_at_html: Di %{date} de hate serrastkirin
     errors:
       in_reply_not_found: Ew şandiya ku tu dikî nakî bersivê bide xuya nake an jî hatiye jêbirin.
-    open_in_web: Di tevnê de veke
     over_character_limit: sînorê karakterê %{max} derbas kir
     pin_errors:
       direct: Şandiyên ku tenê ji bikarhênerên qalkirî re têne xuyangkirin, nayê derzîkirin
       limit: Jixwe te mezintirîn hejmara şandîyên xwe derzî kir
       ownership: Şandiya kesekî din nay derzî kirin
       reblog: Ev şandî nayê derzî kirin
-    poll:
-      total_people:
-        one: "%{count} kes"
-        other: "%{count} kes"
-      total_votes:
-        one: "%{count} deng"
-        other: "%{count} deng"
-      vote: Deng bide
-    show_more: Bêtir nîşan bide
-    show_thread: Mijarê nîşan bide
     title: "%{name}%{quote}"
     visibilities:
       direct: Rasterast
diff --git a/config/locales/la.yml b/config/locales/la.yml
index d3733df934..cc92bf6d28 100644
--- a/config/locales/la.yml
+++ b/config/locales/la.yml
@@ -7,7 +7,6 @@ la:
     hosted_on: Mastodon in %{domain} hospitātum
     title: De
   accounts:
-    follow: Sequere
     followers:
       one: Sectātor
       other: Sectātōrēs
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 164967159b..2f5eb1553e 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -7,7 +7,6 @@ lad:
     hosted_on: Mastodon balabayado en %{domain}
     title: Sovre mozotros
   accounts:
-    follow: Sige
     followers:
       one: Suivante
       other: Suivantes
@@ -1677,23 +1676,12 @@ lad:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: La publikasion a la ke aprovas arispondir no egziste.
-    open_in_web: Avre en web
     over_character_limit: limito de karakteres de %{max} superado
     pin_errors:
       direct: Las publikasyones ke son vizivles solo para los utilizadores enmentados no pueden fiksarse
       limit: Ya tienes fiksado el numero maksimo de publikasyones
       ownership: La publikasyon de otra persona no puede fiksarse
       reblog: No se puede fixar una repartajasyon
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Vota
-    show_more: Amostra mas
-    show_thread: Amostra diskusyon
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direkto
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 07e8ba75a2..42495053e9 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -7,7 +7,6 @@ lt:
     hosted_on: Mastodon talpinamas %{domain}
     title: Apie
   accounts:
-    follow: Sekti
     followers:
       few: Sekėjai
       many: Sekėjo
@@ -1107,16 +1106,11 @@ lt:
         other: "%{count} vaizdų"
     boosted_from_html: Pakelta iš %{acct_link}
     content_warning: 'Turinio įspėjimas: %{warning}'
-    open_in_web: Atidaryti naudojan Web
     over_character_limit: pasiektas %{max} simbolių limitas
     pin_errors:
       limit: Jūs jau prisegėte maksimalų toot'ų skaičų
       ownership: Kitų vartotojų toot'ai negali būti prisegti
       reblog: Pakeltos žinutės negali būti prisegtos
-    poll:
-      vote: Balsuoti
-    show_more: Rodyti daugiau
-    show_thread: Rodyti giją
     visibilities:
       private: Tik sekėjams
       private_long: rodyti tik sekėjams
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 5dd6ff9e1e..09e6b9ba0e 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -7,7 +7,6 @@ lv:
     hosted_on: Mastodon mitināts %{domain}
     title: Par
   accounts:
-    follow: Sekot
     followers:
       one: Sekotājs
       other: Sekotāji
@@ -1645,25 +1644,12 @@ lv:
     edited_at_html: Labots %{date}
     errors:
       in_reply_not_found: Šķiet, ka ziņa, uz kuru tu mēģini atbildēt, nepastāv.
-    open_in_web: Atvērt webā
     over_character_limit: pārsniegts %{max} rakstzīmju ierobežojums
     pin_errors:
       direct: Ziņojumus, kas ir redzami tikai minētajiem lietotājiem, nevar piespraust
       limit: Tu jau esi piespraudis maksimālo ziņu skaitu
       ownership: Kāda cita ierakstu nevar piespraust
       reblog: Izceltu ierakstu nevar piespraust
-    poll:
-      total_people:
-        one: "%{count} cilvēks"
-        other: "%{count} cilvēki"
-        zero: "%{count} cilvēku"
-      total_votes:
-        one: "%{count} balss"
-        other: "%{count} balsis"
-        zero: "%{count} balsu"
-      vote: Balsu skaits
-    show_more: Rādīt vairāk
-    show_thread: Rādīt tematu
     title: "%{name}: “%{quote}”"
     visibilities:
       direct: Tiešs
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index a4b9391c00..bdc0475a6f 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -4,7 +4,6 @@ ml:
     contact_missing: സജ്ജമാക്കിയിട്ടില്ല
     contact_unavailable: ലഭ്യമല്ല
   accounts:
-    follow: പിന്തുടരുക
     following: പിന്തുടരുന്നു
     last_active: അവസാനം സജീവമായിരുന്നത്
     link_verified_on: സന്ധിയുടെ ഉടമസ്ഥാവസ്‌കാശം %{date} ൽ പരിശോധിക്കപ്പെട്ടു
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index c91a624230..39c695a539 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -7,7 +7,6 @@ ms:
     hosted_on: Mastodon dihoskan di %{domain}
     title: Perihal
   accounts:
-    follow: Ikut
     followers:
       other: Pengikut
     following: Mengikuti
@@ -1560,21 +1559,12 @@ ms:
     edited_at_html: Disunting %{date}
     errors:
       in_reply_not_found: Pos yang anda cuba balas nampaknya tidak wujud.
-    open_in_web: Buka dalam web
     over_character_limit: had aksara %{max} melebihi
     pin_errors:
       direct: Pos yang hanya boleh dilihat oleh pengguna yang disebut tidak boleh disematkan
       limit: Anda telah menyematkan bilangan maksimum pos
       ownership: Siaran orang lain tidak boleh disematkan
       reblog: Rangsangan tidak boleh disematkan
-    poll:
-      total_people:
-        other: "%{count} orang"
-      total_votes:
-        other: "%{count} undi"
-      vote: Undi
-    show_more: Tunjuk lebih banyak
-    show_thread: Tunjuk bebenang
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Terus
diff --git a/config/locales/my.yml b/config/locales/my.yml
index 771fbba579..92464523a0 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -7,7 +7,6 @@ my:
     hosted_on: "%{domain} မှ လက်ခံဆောင်ရွက်ထားသော Mastodon"
     title: အကြောင်း
   accounts:
-    follow: စောင့်ကြည့်မယ်
     followers:
       other: စောင့်ကြည့်သူ
     following: စောင့်ကြည့်နေသည်
@@ -1560,21 +1559,12 @@ my:
     edited_at_html: "%{date} ကို ပြင်ဆင်ပြီးပါပြီ"
     errors:
       in_reply_not_found: သင် စာပြန်နေသည့်ပို့စ်မှာ မရှိတော့ပါ။
-    open_in_web: ဝဘ်တွင် ဖွင့်ပါ
     over_character_limit: စာလုံးကန့်သတ်ချက် %{max} ကို ကျော်လွန်သွားပါပြီ
     pin_errors:
       direct: အမည်ဖော်ပြထားသည့် ပို့စ်များကို ပင်တွဲ၍မရပါ
       limit: သင်သည် ပို့စ်အရေအတွက်အများဆုံးကို ပင်တွဲထားပြီးဖြစ်သည်
       ownership: အခြားသူ၏ပို့စ်ကို ပင်တွဲ၍မရပါ
       reblog: Boost လုပ်ထားသောပို့စ်ကို ပင်ထား၍မရပါ
-    poll:
-      total_people:
-        other: "%{count} ယောက်"
-      total_votes:
-        other: မဲအရေအတွက် %{count} မဲ
-      vote: မဲပေးမည်
-    show_more: ပိုမိုပြရန်
-    show_thread: Thread ကို ပြပါ
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: တိုက်ရိုက်
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 63fcf1c857..63656991a8 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -7,7 +7,6 @@ nl:
     hosted_on: Mastodon op %{domain}
     title: Over
   accounts:
-    follow: Volgen
     followers:
       one: Volger
       other: Volgers
@@ -1740,23 +1739,12 @@ nl:
     edited_at_html: Bewerkt op %{date}
     errors:
       in_reply_not_found: Het bericht waarop je probeert te reageren lijkt niet te bestaan.
-    open_in_web: In de webapp openen
     over_character_limit: Limiet van %{max} tekens overschreden
     pin_errors:
       direct: Berichten die alleen zichtbaar zijn voor vermelde gebruikers, kunnen niet worden vastgezet
       limit: Je hebt het maximaal aantal bericht al vastgemaakt
       ownership: Een bericht van iemand anders kan niet worden vastgemaakt
       reblog: Een boost kan niet worden vastgezet
-    poll:
-      total_people:
-        one: "%{count} persoon"
-        other: "%{count} personen"
-      total_votes:
-        one: "%{count} stem"
-        other: "%{count} stemmen"
-      vote: Stemmen
-    show_more: Meer tonen
-    show_thread: Gesprek tonen
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Privébericht
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 47dcc1ac8e..b7beeb4263 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -7,7 +7,6 @@ nn:
     hosted_on: "%{domain} er vert for Mastodon"
     title: Om
   accounts:
-    follow: Fylg
     followers:
       one: Fylgjar
       other: Fylgjarar
@@ -1740,23 +1739,12 @@ nn:
     edited_at_html: Redigert %{date}
     errors:
       in_reply_not_found: Det ser ut til at tutet du freistar å svara ikkje finst.
-    open_in_web: Opn på nett
     over_character_limit: øvregrensa for teikn, %{max}, er nådd
     pin_errors:
       direct: Innlegg som bare er synlige for nevnte brukere kan ikke festes
       limit: Du har allereie festa så mange tut som det går an å festa
       ownership: Du kan ikkje festa andre sine tut
       reblog: Ei framheving kan ikkje festast
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} folk"
-      total_votes:
-        one: "%{count} røyst"
-        other: "%{count} røyster"
-      vote: Røyst
-    show_more: Vis meir
-    show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Direkte
diff --git a/config/locales/no.yml b/config/locales/no.yml
index b3eebd8ecc..635ceedde4 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -7,7 +7,6 @@
     hosted_on: Mastodon driftet på %{domain}
     title: Om
   accounts:
-    follow: Følg
     followers:
       one: Følger
       other: Følgere
@@ -1619,23 +1618,12 @@
     edited_at_html: Redigert %{date}
     errors:
       in_reply_not_found: Posten du prøver å svare ser ikke ut til eksisterer.
-    open_in_web: Åpne i nettleser
     over_character_limit: grensen på %{max} tegn overskredet
     pin_errors:
       direct: Innlegg som bare er synlige for nevnte brukere kan ikke festes
       limit: Du har allerede festet det maksimale antall innlegg
       ownership: Kun egne innlegg kan festes
       reblog: En fremheving kan ikke festes
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} personer"
-      total_votes:
-        one: "%{count} stemme"
-        other: "%{count} stemmer"
-      vote: Stem
-    show_more: Vis mer
-    show_thread: Vis tråden
     title: "%{name}: «%{quote}»"
     visibilities:
       direct: Direkte
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index e88f8a3f69..5cdd9240b0 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -7,7 +7,6 @@ oc:
     hosted_on: Mastodon albergat sus %{domain}
     title: A prepaus
   accounts:
-    follow: Sègre
     followers:
       one: Seguidor
       other: Seguidors
@@ -846,22 +845,11 @@ oc:
     edited_at_html: Modificat %{date}
     errors:
       in_reply_not_found: La publicacion que respondètz sembla pas mai exisitir.
-    open_in_web: Dobrir sul web
     over_character_limit: limit de %{max} caractèrs passat
     pin_errors:
       limit: Avètz ja lo maximum de tuts penjats
       ownership: Se pòt pas penjar lo tut de qualqu’un mai
       reblog: Se pòt pas penjar un tut partejat
-    poll:
-      total_people:
-        one: "%{count} persona"
-        other: "%{count} personas"
-      total_votes:
-        one: "%{count} vòte"
-        other: "%{count} vòtes"
-      vote: Votar
-    show_more: Ne veire mai
-    show_thread: Mostrar lo fil
     title: '%{name} : "%{quote}"'
     visibilities:
       direct: Dirècte
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 7a34358ddb..1899d71008 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -7,7 +7,6 @@ pa:
     hosted_on: "%{domain} ਉੱਤੇ ਹੋਸਟ ਕੀਤਾ ਮਸਟਾਡੋਨ"
     title: ਇਸ ਬਾਰੇ
   accounts:
-    follow: ਫ਼ਾਲੋ
     following: ਫ਼ਾਲੋ ਕੀਤੇ ਜਾ ਰਹੇ
     posts_tab_heading: ਪੋਸਟਾਂ
   admin:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b710df2e78..f0d09cb2d3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -7,7 +7,6 @@ pl:
     hosted_on: Mastodon prowadzony na %{domain}
     title: O nas
   accounts:
-    follow: Obserwuj
     followers:
       few: śledzących
       many: śledzących
@@ -1800,27 +1799,12 @@ pl:
     edited_at_html: Edytowane %{date}
     errors:
       in_reply_not_found: Post, na który próbujesz odpowiedzieć, nie istnieje.
-    open_in_web: Otwórz w przeglądarce
     over_character_limit: limit %{max} znaków przekroczony
     pin_errors:
       direct: Nie możesz przypiąć wpisu, który jest widoczny tylko dla wspomnianych użytkowników
       limit: Przekroczyłeś maksymalną liczbę przypiętych wpisów
       ownership: Nie możesz przypiąć cudzego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
-    poll:
-      total_people:
-        few: "%{count} osoby"
-        many: "%{count} osób"
-        one: "%{count} osoba"
-        other: "%{count} osoby"
-      total_votes:
-        few: "%{count} głosy"
-        many: "%{count} głosy"
-        one: "%{count} głos"
-        other: "%{count} głosy"
-      vote: Głosuj
-    show_more: Pokaż więcej
-    show_thread: Pokaż wątek
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Bezpośredni
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 864a8b4d91..d1140f3645 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -7,7 +7,6 @@ pt-BR:
     hosted_on: Mastodon hospedado em %{domain}
     title: Sobre
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1740,23 +1739,12 @@ pt-BR:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação que você quer responder parece não existir.
-    open_in_web: Abrir no navegador
     over_character_limit: limite de caracteres de %{max} excedido
     pin_errors:
       direct: Publicações visíveis apenas para usuários mencionados não podem ser fixadas
       limit: Você alcançou o número limite de publicações fixadas
       ownership: As publicações dos outros não podem ser fixadas
       reblog: Um impulso não pode ser fixado
-    poll:
-      total_people:
-        one: "%{count} pessoa"
-        other: "%{count} pessoas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Votar
-    show_more: Mostrar mais
-    show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direto
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 0f0d6f36ee..489fb2b89b 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -7,7 +7,6 @@ pt-PT:
     hosted_on: Mastodon alojado em %{domain}
     title: Sobre
   accounts:
-    follow: Seguir
     followers:
       one: Seguidor
       other: Seguidores
@@ -1683,23 +1682,12 @@ pt-PT:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação a que está a tentar responder parece não existir.
-    open_in_web: Abrir na web
     over_character_limit: limite de caracter excedeu %{max}
     pin_errors:
       direct: Publicações visíveis apenas para utilizadores mencionados não podem ser afixadas
       limit: Já afixaste a quantidade máxima de publicações
       ownership: Não podem ser afixadas publicações doutras pessoas
       reblog: Não pode afixar um reforço
-    poll:
-      total_people:
-        one: "%{count} pessoa"
-        other: "%{count} pessoas"
-      total_votes:
-        one: "%{count} voto"
-        other: "%{count} votos"
-      vote: Votar
-    show_more: Mostrar mais
-    show_thread: Mostrar conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direto
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 52982ead2d..d4f202637b 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -7,7 +7,6 @@ ro:
     hosted_on: Mastodon găzduit de %{domain}
     title: Despre
   accounts:
-    follow: Urmărește
     followers:
       few: Urmăritori
       one: Urmăritor
@@ -681,24 +680,11 @@ ro:
       other: 'conținea aceste hashtag-uri nepermise: %{tags}'
     errors:
       in_reply_not_found: Postarea la care încercați să răspundeți nu pare să existe.
-    open_in_web: Deschide pe web
     over_character_limit: s-a depășit limita de caracter %{max}
     pin_errors:
       limit: Deja ai fixat numărul maxim de postări
       ownership: Postarea altcuiva nu poate fi fixată
       reblog: Un impuls nu poate fi fixat
-    poll:
-      total_people:
-        few: "%{count} persoane"
-        one: "%{count} persoană"
-        other: "%{count} de persoane"
-      total_votes:
-        few: "%{count} voturi"
-        one: "%{count} vot"
-        other: "%{count} de voturi"
-      vote: Votează
-    show_more: Arată mai mult
-    show_thread: Arată discuția
     visibilities:
       private: Doar urmăritorii
       private_long: Arată doar urmăritorilor
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9d6b2946ac..d66dded89b 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -7,7 +7,6 @@ ru:
     hosted_on: Вы получили это сообщение, так как зарегистрированы на %{domain}
     title: О проекте
   accounts:
-    follow: Подписаться
     followers:
       few: подписчика
       many: подписчиков
@@ -1692,27 +1691,12 @@ ru:
     edited_at_html: Редактировано %{date}
     errors:
       in_reply_not_found: Пост, на который вы пытаетесь ответить, не существует или удалён.
-    open_in_web: Открыть в веб-версии
     over_character_limit: превышен лимит символов (%{max})
     pin_errors:
       direct: Сообщения, видимые только упомянутым пользователям, не могут быть закреплены
       limit: Вы закрепили максимально возможное число постов
       ownership: Нельзя закрепить чужой пост
       reblog: Нельзя закрепить продвинутый пост
-    poll:
-      total_people:
-        few: "%{count} человека"
-        many: "%{count} человек"
-        one: "%{count} человек"
-        other: "%{count} человек"
-      total_votes:
-        few: "%{count} голоса"
-        many: "%{count} голосов"
-        one: "%{count} голос"
-        other: "%{count} голосов"
-      vote: Голосовать
-    show_more: Развернуть
-    show_thread: Открыть обсуждение
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Адресованный
diff --git a/config/locales/ry.yml b/config/locales/ry.yml
index e384b7f1b7..dd1b78600c 100644
--- a/config/locales/ry.yml
+++ b/config/locales/ry.yml
@@ -1,7 +1,6 @@
 ---
 ry:
   accounts:
-    follow: Пудписати ся
     following: Пудпискы
     posts:
       few: Публикації
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index fee79a1325..435749f470 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -7,7 +7,6 @@ sc:
     hosted_on: Mastodon allogiadu in %{domain}
     title: Informatziones
   accounts:
-    follow: Sighi
     followers:
       one: Sighidura
       other: Sighiduras
@@ -1111,22 +1110,11 @@ sc:
       other: 'cuntenet is etichetas non permìtidas: %{tags}'
     errors:
       in_reply_not_found: Ses chirchende de rispòndere a unu tut chi no esistit prus.
-    open_in_web: Aberi in sa web
     over_character_limit: lìmite de caràteres de %{max} superadu
     pin_errors:
       limit: As giai apicadu su nùmeru màssimu de tuts
       ownership: Is tuts de àtere non podent èssere apicados
       reblog: Is cumpartziduras non podent èssere apicadas
-    poll:
-      total_people:
-        one: "%{count} persone"
-        other: "%{count} persones"
-      total_votes:
-        one: "%{count} votu"
-        other: "%{count} votos"
-      vote: Vota
-    show_more: Ammustra·nde prus
-    show_thread: Ammustra su tema
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Deretu
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 967706f03a..70143a968e 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -7,7 +7,6 @@ sco:
     hosted_on: Mastodon hostit on %{domain}
     title: Aboot
   accounts:
-    follow: Follae
     followers:
       one: Follaer
       other: Follaers
@@ -1394,23 +1393,12 @@ sco:
     edited_at_html: Editit %{date}
     errors:
       in_reply_not_found: The post thit ye'r trying tae reply tae disnae appear tae exist.
-    open_in_web: Open in wab
     over_character_limit: chairacter limit o %{max} exceedit
     pin_errors:
       direct: Posts thit's ainly visible tae menshied uisers cannae be preent
       limit: Ye awriddy preent the maximum nummer o posts
       ownership: Somebody else's post cannae be preent
       reblog: A heeze cannae be preent
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} fowk"
-      total_votes:
-        one: "%{count} vote"
-        other: "%{count} votes"
-      vote: Vote
-    show_more: Shaw mair
-    show_thread: Shaw threid
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direck
diff --git a/config/locales/si.yml b/config/locales/si.yml
index c7968e2479..135a99ceb2 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -7,7 +7,6 @@ si:
     hosted_on: "%{domain} හරහා සත්කාරකත්‍වය ලබයි"
     title: පිළිබඳව
   accounts:
-    follow: අනුගමනය
     followers:
       one: අනුගාමිකයා
       other: අනුගාමිකයින්
@@ -1267,22 +1266,11 @@ si:
     edited_at_html: සංස්කරණය %{date}
     errors:
       in_reply_not_found: ඔබ පිළිතුරු දීමට තැත් කරන ලිපිය නොපවතින බව පෙනෙයි.
-    open_in_web: වෙබයේ විවෘත කරන්න
     over_character_limit: අක්ෂර සීමාව %{max} ඉක්මවා ඇත
     pin_errors:
       direct: සඳහන් කළ අයට පමණක් පෙනෙන ලිපි ඇමිණීමට නොහැකිය
       limit: දැනටමත් මුදුනට ඇමිණිමට හැකි ලිපි සීමාවට ළඟා වී ඇත
       ownership: වෙනත් අයගේ ලිපි ඇමිණීමට නොහැකිය
-    poll:
-      total_people:
-        one: පුද්ගලයින් %{count}
-        other: පුද්ගලයින් %{count}
-      total_votes:
-        one: ඡන්ද %{count} යි
-        other: ඡන්ද %{count} යි
-      vote: ඡන්දය
-    show_more: තව පෙන්වන්න
-    show_thread: නූල් පෙන්වන්න
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: සෘජු
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c49da0fc38..d7eacb6850 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -7,7 +7,6 @@ sk:
     hosted_on: Mastodon hostovaný na %{domain}
     title: Ohľadom
   accounts:
-    follow: Nasleduj
     followers:
       few: Sledovateľov
       many: Sledovateľov
@@ -1259,26 +1258,11 @@ sk:
     edited_at_html: Upravené %{date}
     errors:
       in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, pravdepodobne neexistuje.
-    open_in_web: Otvor v okne na webe
     over_character_limit: limit %{max} znakov bol presiahnutý
     pin_errors:
       limit: Už si si pripol ten najvyšší možný počet hlášok
       ownership: Nieje možné pripnúť hlášku od niekoho iného
       reblog: Vyzdvihnutie sa nedá pripnúť
-    poll:
-      total_people:
-        few: "%{count} ľudí"
-        many: "%{count} ľudia"
-        one: "%{count} človek"
-        other: "%{count} ľudí"
-      total_votes:
-        few: "%{count} hlasov"
-        many: "%{count} hlasov"
-        one: "%{count} hlas"
-        other: "%{count} hlasy"
-      vote: Hlasuj
-    show_more: Ukáž viac
-    show_thread: Ukáž diskusné vlákno
     title: '%{name}: „%{quote}"'
     visibilities:
       direct: Súkromne
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index d0440abb00..ef6d00b8d3 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -7,7 +7,6 @@ sl:
     hosted_on: Mastodon gostuje na %{domain}
     title: O programu
   accounts:
-    follow: Sledi
     followers:
       few: Sledilci
       one: Sledilec
@@ -1785,27 +1784,12 @@ sl:
     edited_at_html: Urejeno %{date}
     errors:
       in_reply_not_found: Objava, na katero želite odgovoriti, ne obstaja.
-    open_in_web: Odpri na spletu
     over_character_limit: omejitev %{max} znakov je presežena
     pin_errors:
       direct: Objav, ki so vidne samo omenjenum uporabnikom, ni mogoče pripenjati
       limit: Pripeli ste največje število objav
       ownership: Objava nekoga drugega ne more biti pripeta
       reblog: Izpostavitev ne more biti pripeta
-    poll:
-      total_people:
-        few: "%{count} osebe"
-        one: "%{count} Oseba"
-        other: "%{count} oseb"
-        two: "%{count} osebi"
-      total_votes:
-        few: "%{count} glasovi"
-        one: "%{count} glas"
-        other: "%{count} glasov"
-        two: "%{count} glasova"
-      vote: Glasuj
-    show_more: Pokaži več
-    show_thread: Pokaži nit
     title: "%{name}: »%{quote}«"
     visibilities:
       direct: Neposredno
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 241dc08b22..70d20592a5 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -7,7 +7,6 @@ sq:
     hosted_on: Server Mastodon i strehuar në %{domain}
     title: Mbi
   accounts:
-    follow: Ndiqeni
     followers:
       one: Ndjekës
       other: Ndjekës
@@ -1732,23 +1731,12 @@ sq:
     edited_at_html: Përpunuar më %{date}
     errors:
       in_reply_not_found: Gjendja të cilës po provoni t’i përgjigjeni s’duket se ekziston.
-    open_in_web: Hape në internet
     over_character_limit: u tejkalua kufi shenjash prej %{max}
     pin_errors:
       direct: Postimet që janë të dukshme vetëm për përdoruesit e përmendur s’mund të fiksohen
       limit: Keni fiksuar tashmë numrin maksimum të mesazheve
       ownership: S’mund të fiksohen mesazhet e të tjerëve
       reblog: S’mund të fiksohet një përforcim
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} vetë"
-      total_votes:
-        one: "%{count} votë"
-        other: "%{count} vota"
-      vote: Votë
-    show_more: Shfaq më tepër
-    show_thread: Shfaq rrjedhën
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: I drejtpërdrejtë
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 428b9cb084..91f0933398 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -7,7 +7,6 @@ sr-Latn:
     hosted_on: Mastodon hostovan na %{domain}
     title: O instanci
   accounts:
-    follow: Zaprati
     followers:
       few: Pratioca
       one: Pratilac
@@ -1670,25 +1669,12 @@ sr-Latn:
     edited_at_html: Izmenjeno %{date}
     errors:
       in_reply_not_found: Objava na koju pokušavate da odgovorite naizgled ne postoji.
-    open_in_web: Otvori u vebu
     over_character_limit: ograničenje od %{max} karaktera prekoračeno
     pin_errors:
       direct: Objave koje su vidljive samo pomenutim korisnicima ne mogu biti prikačene
       limit: Već ste zakačili maksimalan broj objava
       ownership: Tuđa objava se ne može zakačiti
       reblog: Podrška ne može da se prikači
-    poll:
-      total_people:
-        few: "%{count} osobe"
-        one: "%{count} osoba"
-        other: "%{count} ljudi"
-      total_votes:
-        few: "%{count} glasa"
-        one: "%{count} glas"
-        other: "%{count} glasova"
-      vote: Glasajte
-    show_more: Prikaži još
-    show_thread: Prikaži niz
     title: "%{name}: „%{quote}”"
     visibilities:
       direct: Direktno
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 08fbf39fb8..67aee931be 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -7,7 +7,6 @@ sr:
     hosted_on: Mastodon хостован на %{domain}
     title: О инстанци
   accounts:
-    follow: Запрати
     followers:
       few: Пратиоца
       one: Пратилац
@@ -1700,25 +1699,12 @@ sr:
     edited_at_html: Уређено %{date}
     errors:
       in_reply_not_found: Објава на коју покушавате да одговорите наизглед не постоји.
-    open_in_web: Отвори у вебу
     over_character_limit: ограничење од %{max} карактера прекорачено
     pin_errors:
       direct: Објаве које су видљиве само поменутим корисницима не могу бити прикачене
       limit: Већ сте закачили максималан број објава
       ownership: Туђа објава се не може закачити
       reblog: Подршка не може да се прикачи
-    poll:
-      total_people:
-        few: "%{count} особе"
-        one: "%{count} особа"
-        other: "%{count} људи"
-      total_votes:
-        few: "%{count} гласа"
-        one: "%{count} глас"
-        other: "%{count} гласова"
-      vote: Гласајте
-    show_more: Прикажи још
-    show_thread: Прикажи низ
     title: "%{name}: „%{quote}”"
     visibilities:
       direct: Директно
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index c8ddc346a5..99b7ec9b3a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -7,7 +7,6 @@ sv:
     hosted_on: Mastodon-värd på %{domain}
     title: Om
   accounts:
-    follow: Följa
     followers:
       one: Följare
       other: Följare
@@ -1693,23 +1692,12 @@ sv:
     edited_at_html: 'Ändrad: %{date}'
     errors:
       in_reply_not_found: Inlägget du försöker svara på verkar inte existera.
-    open_in_web: Öppna på webben
     over_character_limit: teckengräns på %{max} har överskridits
     pin_errors:
       direct: Inlägg som endast är synliga för nämnda användare kan inte fästas
       limit: Du har redan fäst det maximala antalet inlägg
       ownership: Någon annans inlägg kan inte fästas
       reblog: En boost kan inte fästas
-    poll:
-      total_people:
-        one: "%{count} person"
-        other: "%{count} personer"
-      total_votes:
-        one: "%{count} röst"
-        other: "%{count} röster"
-      vote: Rösta
-    show_more: Visa mer
-    show_thread: Visa tråd
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Direkt
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index c73148eaca..3a98b6a25d 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -6,7 +6,6 @@ ta:
     contact_unavailable: பொ/இ
     hosted_on: மாஸ்டோடாண் %{domain} இனையத்தில் இயங்குகிறது
   accounts:
-    follow: பின்தொடர்
     followers:
       one: பின்தொடர்பவர்
       other: பின்தொடர்பவர்கள்
@@ -220,4 +219,3 @@ ta:
         other: "%{count} ஒலிகள்"
     errors:
       in_reply_not_found: நீங்கள் மறுமொழி அளிக்க முயலும் பதிவு இருப்பதுபோல் தெரியவில்லை.
-    show_thread: தொடரைக் காட்டு
diff --git a/config/locales/te.yml b/config/locales/te.yml
index a5eb8d7794..84697a4aef 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -6,7 +6,6 @@ te:
     contact_unavailable: వర్తించదు
     hosted_on: మాస్టొడాన్ %{domain} లో హోస్టు చేయబడింది
   accounts:
-    follow: అనుసరించు
     followers:
       one: అనుచరి
       other: అనుచరులు
diff --git a/config/locales/th.yml b/config/locales/th.yml
index d1de9fd818..cbacdfac48 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -7,7 +7,6 @@ th:
     hosted_on: Mastodon ที่โฮสต์ที่ %{domain}
     title: เกี่ยวกับ
   accounts:
-    follow: ติดตาม
     followers:
       other: ผู้ติดตาม
     following: กำลังติดตาม
@@ -1703,21 +1702,12 @@ th:
     edited_at_html: แก้ไขเมื่อ %{date}
     errors:
       in_reply_not_found: ดูเหมือนว่าจะไม่มีโพสต์ที่คุณกำลังพยายามตอบกลับอยู่
-    open_in_web: เปิดในเว็บ
     over_character_limit: เกินขีดจำกัดตัวอักษรที่ %{max} แล้ว
     pin_errors:
       direct: ไม่สามารถปักหมุดโพสต์ที่ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น
       limit: คุณได้ปักหมุดโพสต์ถึงจำนวนสูงสุดไปแล้ว
       ownership: ไม่สามารถปักหมุดโพสต์ของคนอื่น
       reblog: ไม่สามารถปักหมุดการดัน
-    poll:
-      total_people:
-        other: "%{count} คน"
-      total_votes:
-        other: "%{count} การลงคะแนน"
-      vote: ลงคะแนน
-    show_more: แสดงเพิ่มเติม
-    show_thread: แสดงกระทู้
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: โดยตรง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 785be3caf4..d6ca6b4276 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -7,7 +7,6 @@ tr:
     hosted_on: Mastodon %{domain} üzerinde barındırılıyor
     title: Hakkında
   accounts:
-    follow: Takip et
     followers:
       one: Takipçi
       other: Takipçiler
@@ -1740,23 +1739,12 @@ tr:
     edited_at_html: "%{date} tarihinde düzenlendi"
     errors:
       in_reply_not_found: Yanıtlamaya çalıştığınız durum yok gibi görünüyor.
-    open_in_web: Web sayfasında aç
     over_character_limit: "%{max} karakter limiti aşıldı"
     pin_errors:
       direct: Sadece değinilen kullanıcıların görebileceği gönderiler üstte tutulamaz
       limit: Halihazırda maksimum sayıda gönderi sabitlediniz
       ownership: Başkasının gönderisi sabitlenemez
       reblog: Bir gönderi sabitlenemez
-    poll:
-      total_people:
-        one: "%{count} kişi"
-        other: "%{count} kişiler"
-      total_votes:
-        one: "%{count} oy"
-        other: "%{count} oylar"
-      vote: Oy Ver
-    show_more: Daha fazlasını göster
-    show_thread: Konuyu göster
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Doğrudan
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 3a0d9d9ce8..7847d636eb 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -4,7 +4,6 @@ tt:
     contact_unavailable: Юк
     title: Проект турында
   accounts:
-    follow: Языл
     followers:
       other: язылучы
     following: Язылгансыз
@@ -519,12 +518,6 @@ tt:
       video:
         other: "%{count} видео"
     edited_at_html: "%{date} көнне төзәтте"
-    open_in_web: Веб-та ачу
-    poll:
-      total_people:
-        other: "%{count} кеше"
-      vote: Тавыш бирү
-    show_more: Күбрәк күрсәтү
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Ияртүчеләр генә
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f5cd40bad7..e8c4e68998 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -7,7 +7,6 @@ uk:
     hosted_on: Mastodon розміщено на %{domain}
     title: Про програму
   accounts:
-    follow: Підписатися
     followers:
       few: Підписники
       many: Підписників
@@ -1800,27 +1799,12 @@ uk:
     edited_at_html: Відредаговано %{date}
     errors:
       in_reply_not_found: Допису, на який ви намагаєтеся відповісти, не існує.
-    open_in_web: Відкрити у вебі
     over_character_limit: перевищено ліміт символів %{max}
     pin_errors:
       direct: Не можливо прикріпити дописи, які видимі лише згаданим користувачам
       limit: Ви вже закріпили максимальну кількість дописів
       ownership: Не можна закріпити чужий допис
       reblog: Не можна закріпити просунутий допис
-    poll:
-      total_people:
-        few: "%{count} людей"
-        many: "%{count} людей"
-        one: "%{count} людина"
-        other: "%{count} людей"
-      total_votes:
-        few: "%{count} голоса"
-        many: "%{count} голосів"
-        one: "%{count} голос"
-        other: "%{count} голоси"
-      vote: Проголосувати
-    show_more: Розгорнути
-    show_thread: Відкрити обговорення
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Особисто
diff --git a/config/locales/uz.yml b/config/locales/uz.yml
index 403ffd33cf..9215a0f0e8 100644
--- a/config/locales/uz.yml
+++ b/config/locales/uz.yml
@@ -2,8 +2,6 @@
 uz:
   about:
     title: Haqida
-  accounts:
-    follow: Obuna bo‘lish
   admin:
     accounts:
       display_name: Ko'rsatiladigan nom
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index dfb36c02da..a03b46c911 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -7,7 +7,6 @@ vi:
     hosted_on: "%{domain} vận hành nhờ Mastodon"
     title: Giới thiệu
   accounts:
-    follow: Theo dõi
     followers:
       other: Người theo dõi
     following: Theo dõi
@@ -1703,21 +1702,12 @@ vi:
     edited_at_html: Sửa %{date}
     errors:
       in_reply_not_found: Bạn đang trả lời một tút không còn tồn tại.
-    open_in_web: Xem trong web
     over_character_limit: vượt quá giới hạn %{max} ký tự
     pin_errors:
       direct: Không thể ghim những tút nhắn riêng
       limit: Bạn đã ghim quá số lượng tút cho phép
       ownership: Không thể ghim tút của người khác
       reblog: Không thể ghim tút đăng lại
-    poll:
-      total_people:
-        other: "%{count} người bình chọn"
-      total_votes:
-        other: "%{count} người bình chọn"
-      vote: Bình chọn
-    show_more: Đọc thêm
-    show_thread: Nội dung gốc
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Nhắn riêng
diff --git a/config/locales/zgh.yml b/config/locales/zgh.yml
index 180fcf2f16..cbd0bc961b 100644
--- a/config/locales/zgh.yml
+++ b/config/locales/zgh.yml
@@ -1,7 +1,6 @@
 ---
 zgh:
   accounts:
-    follow: ⴹⴼⵕ
     followers:
       one: ⴰⵎⴹⴼⴰⵕ
       other: ⵉⵎⴹⴼⴰⵕⵏ
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 747dcf3738..277785f683 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -7,7 +7,6 @@ zh-CN:
     hosted_on: 运行在 %{domain} 上的 Mastodon 实例
     title: 关于本站
   accounts:
-    follow: 关注
     followers:
       other: 关注者
     following: 正在关注
@@ -1710,21 +1709,12 @@ zh-CN:
     edited_at_html: 编辑于 %{date}
     errors:
       in_reply_not_found: 你回复的嘟文似乎不存在
-    open_in_web: 在站内打开
     over_character_limit: 超过了 %{max} 字的限制
     pin_errors:
       direct: 仅对被提及的用户可见的帖子不能被置顶
       limit: 你所固定的嘟文数量已达到上限
       ownership: 不能置顶别人的嘟文
       reblog: 不能置顶转嘟
-    poll:
-      total_people:
-        other: "%{count} 人"
-      total_votes:
-        other: "%{count} 票"
-      vote: 投票
-    show_more: 显示更多
-    show_thread: 显示全部对话
     title: "%{name}：“%{quote}”"
     visibilities:
       direct: 私信
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 90227b911d..7682712759 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -7,7 +7,6 @@ zh-HK:
     hosted_on: 在 %{domain} 運作的 Mastodon 伺服器
     title: 關於
   accounts:
-    follow: 關注
     followers:
       other: 關注者
     following: 正在關注
@@ -1607,21 +1606,12 @@ zh-HK:
     edited_at_html: 編輯於 %{date}
     errors:
       in_reply_not_found: 你所回覆的嘟文並不存在。
-    open_in_web: 開啟網頁
     over_character_limit: 超過了 %{max} 字的限制
     pin_errors:
       direct: 無法將只有被提及使用者可見的帖文置頂
       limit: 你所置頂的文章數量已經達到上限
       ownership: 不能置頂他人的文章
       reblog: 不能置頂轉推
-    poll:
-      total_people:
-        other: "%{count} 人"
-      total_votes:
-        other: "%{count} 票"
-      vote: 投票
-    show_more: 顯示更多
-    show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
       direct: 私人訊息
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 8eab176d7d..35f000b601 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -7,7 +7,6 @@ zh-TW:
     hosted_on: 於 %{domain} 託管之 Mastodon 站點
     title: 關於本站
   accounts:
-    follow: 跟隨
     followers:
       other: 跟隨者
     following: 正在跟隨
@@ -1712,21 +1711,12 @@ zh-TW:
     edited_at_html: 編輯於 %{date}
     errors:
       in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
-    open_in_web: 以網頁開啟
     over_character_limit: 已超過 %{max} 字的限制
     pin_errors:
       direct: 無法釘選只有僅提及使用者可見之嘟文
       limit: 釘選嘟文的數量已達上限
       ownership: 不能釘選他人的嘟文
       reblog: 不能釘選轉嘟
-    poll:
-      total_people:
-        other: "%{count} 個人"
-      total_votes:
-        other: "%{count} 票"
-      vote: 投票
-    show_more: 顯示更多
-    show_thread: 顯示討論串
     title: "%{name}：「%{quote}」"
     visibilities:
       direct: 私訊
diff --git a/public/embed.js b/public/embed.js
index f8e6a22db4..3fb57469a9 100644
--- a/public/embed.js
+++ b/public/embed.js
@@ -1,5 +1,7 @@
 // @ts-check
 
+const allowedPrefixes = (document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.dataset.allowedPrefixes) ? document.currentScript.dataset.allowedPrefixes.split(' ') : [];
+
 (function () {
   'use strict';
 
@@ -18,45 +20,71 @@
     }
   };
 
+  /**
+   * @param {Map} map
+   */
+  var generateId = function (map) {
+    var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
+
+    while (id === 0 || map.has(id)) {
+      id = crypto.getRandomValues(idBuffer)[0];
+      failCount++;
+
+      if (failCount > 100) {
+        // give up and assign (easily guessable) unique number if getRandomValues is broken or no luck
+        id = -(map.size + 1);
+        break;
+      }
+    }
+
+    return id;
+  };
+
   ready(function () {
-    /** @type {Map<number, HTMLIFrameElement>} */
-    var iframes = new Map();
+    /** @type {Map<number, HTMLQuoteElement | HTMLIFrameElement>} */
+    var embeds = new Map();
 
     window.addEventListener('message', function (e) {
       var data = e.data || {};
 
-      if (typeof data !== 'object' || data.type !== 'setHeight' || !iframes.has(data.id)) {
+      if (typeof data !== 'object' || data.type !== 'setHeight' || !embeds.has(data.id)) {
         return;
       }
 
-      var iframe = iframes.get(data.id);
+      var embed = embeds.get(data.id);
 
-      if(!iframe) return;
-
-      if ('source' in e && iframe.contentWindow !== e.source) {
-        return;
+      if (embed instanceof HTMLIFrameElement) {
+        embed.height = data.height;
       }
 
-      iframe.height = data.height;
+      if (embed instanceof HTMLQuoteElement) {
+        var iframe = embed.querySelector('iframe');
+
+        if (!iframe || ('source' in e && iframe.contentWindow !== e.source)) {
+          return;
+        }
+
+        iframe.height = data.height;
+
+        var placeholder = embed.querySelector('a');
+
+        if (!placeholder) return;
+
+        embed.removeChild(placeholder);
+      }
     });
 
+    // Legacy embeds
     document.querySelectorAll('iframe.mastodon-embed').forEach(iframe => {
-      // select unique id for each iframe
-      var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
-      while (id === 0 || iframes.has(id)) {
-        id = crypto.getRandomValues(idBuffer)[0];
-        failCount++;
-        if (failCount > 100) {
-          // give up and assign (easily guessable) unique number if getRandomValues is broken or no luck
-          id = -(iframes.size + 1);
-          break;
-        }
-      }
+      var id = generateId(embeds);
 
-      iframes.set(id, iframe);
+      embeds.set(id, iframe);
 
-      iframe.scrolling = 'no';
+      iframe.allow = 'fullscreen';
+      iframe.sandbox = 'allow-scripts allow-same-origin';
+      iframe.style.border = 0;
       iframe.style.overflow = 'hidden';
+      iframe.style.display = 'block';
 
       iframe.onload = function () {
         iframe.contentWindow.postMessage({
@@ -65,7 +93,38 @@
         }, '*');
       };
 
-      iframe.onload();
+      iframe.onload(); // In case the script is executing after the iframe has already loaded
+    });
+
+    // New generation of embeds
+    document.querySelectorAll('blockquote.mastodon-embed').forEach(container => {
+      var id = generateId(embeds);
+
+      embeds.set(id, container);
+
+      var iframe = document.createElement('iframe');
+      var embedUrl = new URL(container.getAttribute('data-embed-url'));
+
+      if (embedUrl.protocol !== 'https:' && embedUrl.protocol !== 'http:') return;
+      if (allowedPrefixes.every((allowedPrefix) => !embedUrl.toString().startsWith(allowedPrefix))) return;
+
+      iframe.src = embedUrl.toString();
+      iframe.width = container.clientWidth;
+      iframe.height = 0;
+      iframe.allow = 'fullscreen';
+      iframe.sandbox = 'allow-scripts allow-same-origin';
+      iframe.style.border = 0;
+      iframe.style.overflow = 'hidden';
+      iframe.style.display = 'block';
+
+      iframe.onload = function () {
+        iframe.contentWindow.postMessage({
+          type: 'setHeight',
+          id: id,
+        }, '*');
+      };
+
+      container.appendChild(iframe);
     });
   });
 })();
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index 2d5ff0135b..5042523df8 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -781,7 +781,6 @@ RSpec.describe StatusesController do
           'Cache-Control' => include('public'),
           'Link' => satisfy { |header| header.to_s.include?('activity+json') }
         )
-        expect(response.body).to include status.text
       end
     end
 
diff --git a/spec/helpers/media_component_helper_spec.rb b/spec/helpers/media_component_helper_spec.rb
index ec87a707cb..a44b9b8415 100644
--- a/spec/helpers/media_component_helper_spec.rb
+++ b/spec/helpers/media_component_helper_spec.rb
@@ -32,28 +32,6 @@ RSpec.describe MediaComponentHelper do
     end
   end
 
-  describe 'render_card_component' do
-    let(:status) { Fabricate(:status) }
-    let(:result) { helper.render_card_component(status) }
-
-    before do
-      PreviewCardsStatus.create(status: status, preview_card: Fabricate(:preview_card))
-    end
-
-    it 'returns the correct react component markup' do
-      expect(parsed_html.div['data-component']).to eq('Card')
-    end
-  end
-
-  describe 'render_poll_component' do
-    let(:status) { Fabricate(:status, poll: Fabricate(:poll)) }
-    let(:result) { helper.render_poll_component(status) }
-
-    it 'returns the correct react component markup' do
-      expect(parsed_html.div['data-component']).to eq('Poll')
-    end
-  end
-
   private
 
   def parsed_html

From abe17172156920bcb4a850a480597ded401be6a1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 10 Sep 2024 11:29:17 +0200
Subject: [PATCH 26/89] [Glitch] Change design of hide media button in web UI

Port 3929e3c6d21226ad42f743a283576004d9c1c7eb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/media_gallery.jsx       | 32 +++++-----
 .../flavours/glitch/styles/components.scss    | 60 +++++++++++--------
 2 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx
index 5c40e2b22f..1710ca9691 100644
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 
@@ -10,17 +10,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { debounce } from 'lodash';
 
-import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'flavours/glitch/components/blurhash';
 
 import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
 
-import { IconButton } from './icon_button';
-
-const messages = defineMessages({
-  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: '{number, plural, one {Hide image} other {Hide images}}' },
-});
-
 class Item extends PureComponent {
 
   static propTypes = {
@@ -220,7 +213,6 @@ class MediaGallery extends PureComponent {
     lang: PropTypes.string,
     size: PropTypes.object,
     onOpenMedia: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
     defaultWidth: PropTypes.number,
     cacheWidth: PropTypes.func,
     visible: PropTypes.bool,
@@ -309,7 +301,7 @@ class MediaGallery extends PureComponent {
   }
 
   render () {
-    const { media, lang, intl, sensitive, letterbox, fullwidth, defaultWidth, autoplay } = this.props;
+    const { media, lang, sensitive, letterbox, fullwidth, defaultWidth, autoplay } = this.props;
     const { visible } = this.state;
     const size     = media.size;
     const uncached = media.every(attachment => attachment.get('type') === 'unknown');
@@ -343,9 +335,7 @@ class MediaGallery extends PureComponent {
           </span>
         </button>
       );
-    } else if (visible) {
-      spoilerButton = <IconButton title={intl.formatMessage(messages.toggle_visible, { number: size })} icon='eye-slash' iconComponent={VisibilityOffIcon} overlay onClick={this.handleOpen} ariaHidden />;
-    } else {
+    } else if (!visible) {
       spoilerButton = (
         <button type='button' onClick={this.handleOpen} className='spoiler-button__overlay'>
           <span className='spoiler-button__overlay__label'>
@@ -358,15 +348,23 @@ class MediaGallery extends PureComponent {
 
     return (
       <div className={computedClass} style={style} ref={this.handleRef}>
-        <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible && !uncached, 'spoiler-button--click-thru': uncached })}>
-          {spoilerButton}
-        </div>
+        {(!visible || uncached) && (
+          <div className={classNames('spoiler-button', { 'spoiler-button--click-thru': uncached })}>
+            {spoilerButton}
+          </div>
+        )}
 
         {children}
+
+        {(visible && !uncached) && (
+          <div className='media-gallery__actions'>
+            <button className='media-gallery__actions__pill' onClick={this.handleOpen}><FormattedMessage id='media_gallery.hide' defaultMessage='Hide' /></button>
+          </div>
+        )}
       </div>
     );
   }
 
 }
 
-export default injectIntl(MediaGallery);
+export default MediaGallery;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 51d87dbddf..70f950f3ca 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -5050,22 +5050,14 @@ a.status-card {
   position: absolute;
   z-index: 100;
 
-  &--minified {
-    display: block;
-    inset-inline-start: 4px;
-    top: 4px;
-    width: auto;
-    height: auto;
+  &--hidden {
+    display: none;
   }
 
   &--click-thru {
     pointer-events: none;
   }
 
-  &--hidden {
-    display: none;
-  }
-
   &__overlay {
     display: flex;
     align-items: center;
@@ -5077,19 +5069,20 @@ a.status-card {
     margin: 0;
     border: 0;
     color: $white;
+    line-height: 20px;
+    font-size: 14px;
 
     &__label {
       background-color: rgba($black, 0.45);
       backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
-      border-radius: 6px;
-      padding: 10px 15px;
+      border-radius: 8px;
+      padding: 12px 16px;
       display: flex;
       align-items: center;
       justify-content: center;
-      gap: 8px;
+      gap: 4px;
       flex-direction: column;
-      font-weight: 500;
-      font-size: 14px;
+      font-weight: 600;
     }
 
     &__action {
@@ -7336,10 +7329,32 @@ img.modal-warning {
   }
 }
 
-.media-gallery__item__badges {
+.media-gallery__actions {
   position: absolute;
   bottom: 6px;
-  inset-inline-start: 6px;
+  inset-inline-end: 6px;
+  display: flex;
+  gap: 2px;
+  z-index: 2;
+
+  &__pill {
+    display: block;
+    color: $white;
+    border: 0;
+    background: rgba($black, 0.65);
+    backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
+    padding: 3px 12px;
+    border-radius: 99px;
+    font-size: 14px;
+    font-weight: 700;
+    line-height: 20px;
+  }
+}
+
+.media-gallery__item__badges {
+  position: absolute;
+  bottom: 8px;
+  inset-inline-start: 8px;
   display: flex;
   gap: 2px;
 }
@@ -7352,18 +7367,13 @@ img.modal-warning {
   color: $white;
   background: rgba($black, 0.65);
   backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
-  padding: 2px 6px;
+  padding: 3px 8px;
   border-radius: 4px;
-  font-size: 11px;
+  font-size: 12px;
   font-weight: 700;
   z-index: 1;
   pointer-events: none;
-  line-height: 18px;
-
-  .icon {
-    width: 15px;
-    height: 15px;
-  }
+  line-height: 20px;
 }
 
 .attachment-list {

From 77cbe2332a5bf505e1d6f171714f42d5420bb599 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 10 Sep 2024 14:00:40 +0200
Subject: [PATCH 27/89] [Glitch] Add ability to manage which websites can
 credit you in link previews

Port CSS changes from e0c27a504788bdc6cd518072e557313e4ec5ee7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/forms.scss         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 81ce9a695f..29f4fe04f7 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -12,6 +12,41 @@ code {
   margin: 50px auto;
 }
 
+.form-section {
+  border-radius: 8px;
+  background: var(--surface-background-color);
+  padding: 24px;
+  margin-bottom: 24px;
+}
+
+.fade-out-top {
+  position: relative;
+  overflow: hidden;
+  height: 160px;
+
+  &::after {
+    content: '';
+    display: block;
+    background: linear-gradient(
+      to bottom,
+      var(--surface-background-color),
+      transparent
+    );
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100px;
+    pointer-events: none;
+  }
+
+  & > div {
+    position: absolute;
+    inset-inline-start: 0;
+    bottom: 0;
+  }
+}
+
 .indicator-icon {
   display: flex;
   align-items: center;

From ab763c493fd8d40db6005282c38bd2636120f273 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 12 Sep 2024 13:14:42 +0200
Subject: [PATCH 28/89] Ignore `undefined` as canonical url (#31882)

---
 app/lib/link_details_extractor.rb       | 2 +-
 spec/lib/link_details_extractor_spec.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index dff57f74f3..e4e815c38d 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -225,7 +225,7 @@ class LinkDetailsExtractor
   end
 
   def valid_url_or_nil(str, same_origin_only: false)
-    return if str.blank? || str == 'null'
+    return if str.blank? || str == 'null' || str == 'undefined'
 
     url = @original_url + Addressable::URI.parse(str)
 
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb
index b1e5cedced..d8d9db0ad1 100644
--- a/spec/lib/link_details_extractor_spec.rb
+++ b/spec/lib/link_details_extractor_spec.rb
@@ -33,6 +33,14 @@ RSpec.describe LinkDetailsExtractor do
         expect(subject.canonical_url).to eq original_url
       end
     end
+
+    context 'when canonical URL is set to "undefined"' do
+      let(:url) { 'undefined' }
+
+      it 'ignores the canonical URLs' do
+        expect(subject.canonical_url).to eq original_url
+      end
+    end
   end
 
   context 'when only basic metadata is present' do

From 24ef8255b3f9b44cb54f49bc78fe3382a7070b1a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 14:54:16 +0200
Subject: [PATCH 29/89] Change design of embed modal in web UI (#31801)

---
 .../mastodon/components/copy_paste_text.tsx   |  90 ++++++++++++++
 .../mastodon/components/status_action_bar.jsx |   2 +-
 .../mastodon/containers/status_container.jsx  |   6 +-
 .../mastodon/features/onboarding/share.jsx    |  63 +---------
 .../features/status/components/action_bar.jsx |   2 +-
 .../features/ui/components/embed_modal.jsx    | 101 ---------------
 .../features/ui/components/embed_modal.tsx    | 116 ++++++++++++++++++
 app/javascript/mastodon/locales/en.json       |   2 +-
 .../styles/mastodon/components.scss           | 111 ++++++++---------
 app/serializers/oembed_serializer.rb          |  17 ++-
 app/views/layouts/embedded.html.haml          |   2 +-
 .../initializers/content_security_policy.rb   |  11 +-
 12 files changed, 278 insertions(+), 245 deletions(-)
 create mode 100644 app/javascript/mastodon/components/copy_paste_text.tsx
 delete mode 100644 app/javascript/mastodon/features/ui/components/embed_modal.jsx
 create mode 100644 app/javascript/mastodon/features/ui/components/embed_modal.tsx

diff --git a/app/javascript/mastodon/components/copy_paste_text.tsx b/app/javascript/mastodon/components/copy_paste_text.tsx
new file mode 100644
index 0000000000..f888acd0f7
--- /dev/null
+++ b/app/javascript/mastodon/components/copy_paste_text.tsx
@@ -0,0 +1,90 @@
+import { useRef, useState, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
+import { useTimeout } from 'mastodon/../hooks/useTimeout';
+import { Icon } from 'mastodon/components/icon';
+
+export const CopyPasteText: React.FC<{ value: string }> = ({ value }) => {
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  const [copied, setCopied] = useState(false);
+  const [focused, setFocused] = useState(false);
+  const [setAnimationTimeout] = useTimeout();
+
+  const handleInputClick = useCallback(() => {
+    setCopied(false);
+
+    if (inputRef.current) {
+      inputRef.current.focus();
+      inputRef.current.select();
+      inputRef.current.setSelectionRange(0, value.length);
+    }
+  }, [setCopied, value]);
+
+  const handleButtonClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      void navigator.clipboard.writeText(value);
+      inputRef.current?.blur();
+      setCopied(true);
+      setAnimationTimeout(() => {
+        setCopied(false);
+      }, 700);
+    },
+    [setCopied, setAnimationTimeout, value],
+  );
+
+  const handleKeyUp = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (e.key !== ' ') return;
+      void navigator.clipboard.writeText(value);
+      setCopied(true);
+      setAnimationTimeout(() => {
+        setCopied(false);
+      }, 700);
+    },
+    [setCopied, setAnimationTimeout, value],
+  );
+
+  const handleFocus = useCallback(() => {
+    setFocused(true);
+  }, [setFocused]);
+
+  const handleBlur = useCallback(() => {
+    setFocused(false);
+  }, [setFocused]);
+
+  return (
+    <div
+      className={classNames('copy-paste-text', { copied, focused })}
+      tabIndex={0}
+      role='button'
+      onClick={handleInputClick}
+      onKeyUp={handleKeyUp}
+    >
+      <textarea
+        readOnly
+        value={value}
+        ref={inputRef}
+        onClick={handleInputClick}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+      />
+
+      <button className='button' onClick={handleButtonClick}>
+        <Icon id='copy' icon={ContentCopyIcon} />{' '}
+        {copied ? (
+          <FormattedMessage id='copypaste.copied' defaultMessage='Copied' />
+        ) : (
+          <FormattedMessage
+            id='copypaste.copy_to_clipboard'
+            defaultMessage='Copy to clipboard'
+          />
+        )}
+      </button>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index f24f81e1b2..165e81c7d8 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -55,7 +55,7 @@ const messages = defineMessages({
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  embed: { id: 'status.embed', defaultMessage: 'Get embed code' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 58c5aac8f8..0fb5f25560 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -6,7 +6,6 @@ import {
   unmuteAccount,
   unblockAccount,
 } from '../actions/accounts';
-import { showAlertForError } from '../actions/alerts';
 import { initBlockModal } from '../actions/blocks';
 import {
   replyCompose,
@@ -100,10 +99,7 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
   onEmbed (status) {
     dispatch(openModal({
       modalType: 'EMBED',
-      modalProps: {
-        id: status.get('id'),
-        onError: error => dispatch(showAlertForError(error)),
-      },
+      modalProps: { id: status.get('id') },
     }));
   },
 
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index 32a86ab6cc..9c720e9074 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -10,8 +10,8 @@ import { Link } from 'react-router-dom';
 import SwipeableViews from 'react-swipeable-views';
 
 import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
+import { CopyPasteText } from 'mastodon/components/copy_paste_text';
 import { Icon }  from 'mastodon/components/icon';
 import { me, domain } from 'mastodon/initial_state';
 import { useAppSelector } from 'mastodon/store';
@@ -20,67 +20,6 @@ const messages = defineMessages({
   shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },
 });
 
-class CopyPasteText extends PureComponent {
-
-  static propTypes = {
-    value: PropTypes.string,
-  };
-
-  state = {
-    copied: false,
-    focused: false,
-  };
-
-  setRef = c => {
-    this.input = c;
-  };
-
-  handleInputClick = () => {
-    this.setState({ copied: false });
-    this.input.focus();
-    this.input.select();
-    this.input.setSelectionRange(0, this.props.value.length);
-  };
-
-  handleButtonClick = e => {
-    e.stopPropagation();
-
-    const { value } = this.props;
-    navigator.clipboard.writeText(value);
-    this.input.blur();
-    this.setState({ copied: true });
-    this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
-  };
-
-  handleFocus = () => {
-    this.setState({ focused: true });
-  };
-
-  handleBlur = () => {
-    this.setState({ focused: false });
-  };
-
-  componentWillUnmount () {
-    if (this.timeout) clearTimeout(this.timeout);
-  }
-
-  render () {
-    const { value } = this.props;
-    const { copied, focused } = this.state;
-
-    return (
-      <div className={classNames('copy-paste-text', { copied, focused })} tabIndex='0' role='button' onClick={this.handleInputClick}>
-        <textarea readOnly value={value} ref={this.setRef} onClick={this.handleInputClick} onFocus={this.handleFocus} onBlur={this.handleBlur} />
-
-        <button className='button' onClick={this.handleButtonClick}>
-          <Icon id='copy' icon={ContentCopyIcon} /> {copied ? <FormattedMessage id='copypaste.copied' defaultMessage='Copied' /> : <FormattedMessage id='copypaste.copy_to_clipboard' defaultMessage='Copy to clipboard' />}
-        </button>
-      </div>
-    );
-  }
-
-}
-
 class TipCarousel extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index d90ca464a7..8ba2db7d8d 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -49,7 +49,7 @@ const messages = defineMessages({
   share: { id: 'status.share', defaultMessage: 'Share' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  embed: { id: 'status.embed', defaultMessage: 'Get embed code' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.jsx b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
deleted file mode 100644
index a4e5fc9dfb..0000000000
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import api from 'mastodon/api';
-import { IconButton } from 'mastodon/components/icon_button';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-class EmbedModal extends ImmutablePureComponent {
-
-  static propTypes = {
-    id: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  state = {
-    loading: false,
-    oembed: null,
-  };
-
-  componentDidMount () {
-    const { id } = this.props;
-
-    this.setState({ loading: true });
-
-    api().get(`/api/web/embeds/${id}`).then(res => {
-      this.setState({ loading: false, oembed: res.data });
-
-      const iframeDocument = this.iframe.contentWindow.document;
-
-      iframeDocument.open();
-      iframeDocument.write(res.data.html);
-      iframeDocument.close();
-
-      iframeDocument.body.style.margin = 0;
-      this.iframe.width  = iframeDocument.body.scrollWidth;
-      this.iframe.height = iframeDocument.body.scrollHeight;
-    }).catch(error => {
-      this.props.onError(error);
-    });
-  }
-
-  setIframeRef = c =>  {
-    this.iframe = c;
-  };
-
-  handleTextareaClick = (e) => {
-    e.target.select();
-  };
-
-  render () {
-    const { intl, onClose } = this.props;
-    const { oembed } = this.state;
-
-    return (
-      <div className='modal-root__modal report-modal embed-modal'>
-        <div className='report-modal__target'>
-          <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' iconComponent={CloseIcon} onClick={onClose} size={16} />
-          <FormattedMessage id='status.embed' defaultMessage='Embed' />
-        </div>
-
-        <div className='report-modal__container embed-modal__container' style={{ display: 'block' }}>
-          <p className='hint'>
-            <FormattedMessage id='embed.instructions' defaultMessage='Embed this status on your website by copying the code below.' />
-          </p>
-
-          <input
-            type='text'
-            className='embed-modal__html'
-            readOnly
-            value={oembed && oembed.html || ''}
-            onClick={this.handleTextareaClick}
-          />
-
-          <p className='hint'>
-            <FormattedMessage id='embed.preview' defaultMessage='Here is what it will look like:' />
-          </p>
-
-          <iframe
-            className='embed-modal__iframe'
-            frameBorder='0'
-            ref={this.setIframeRef}
-            sandbox='allow-scripts allow-same-origin'
-            title='preview'
-          />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(EmbedModal);
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.tsx b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
new file mode 100644
index 0000000000..8f623e62b5
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
@@ -0,0 +1,116 @@
+import { useRef, useState, useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { showAlertForError } from 'mastodon/actions/alerts';
+import api from 'mastodon/api';
+import { Button } from 'mastodon/components/button';
+import { CopyPasteText } from 'mastodon/components/copy_paste_text';
+import { useAppDispatch } from 'mastodon/store';
+
+interface OEmbedResponse {
+  html: string;
+}
+
+const EmbedModal: React.FC<{
+  id: string;
+  onClose: () => void;
+}> = ({ id, onClose }) => {
+  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const intervalRef = useRef<ReturnType<typeof setInterval>>();
+  const [oembed, setOembed] = useState<OEmbedResponse | null>(null);
+  const dispatch = useAppDispatch();
+
+  useEffect(() => {
+    api()
+      .get(`/api/web/embeds/${id}`)
+      .then((res) => {
+        const data = res.data as OEmbedResponse;
+
+        setOembed(data);
+
+        const iframeDocument = iframeRef.current?.contentWindow?.document;
+
+        if (!iframeDocument) {
+          return '';
+        }
+
+        iframeDocument.open();
+        iframeDocument.write(data.html);
+        iframeDocument.close();
+
+        iframeDocument.body.style.margin = '0px';
+
+        // This is our best chance to ensure the parent iframe has the correct height...
+        intervalRef.current = setInterval(
+          () =>
+            window.requestAnimationFrame(() => {
+              if (iframeRef.current) {
+                iframeRef.current.width = `${iframeDocument.body.scrollWidth}px`;
+                iframeRef.current.height = `${iframeDocument.body.scrollHeight}px`;
+              }
+            }),
+          100,
+        );
+
+        return '';
+      })
+      .catch((error: unknown) => {
+        dispatch(showAlertForError(error));
+      });
+  }, [dispatch, id, setOembed]);
+
+  useEffect(
+    () => () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+      }
+    },
+    [],
+  );
+
+  return (
+    <div className='modal-root__modal dialog-modal'>
+      <div className='dialog-modal__header'>
+        <Button onClick={onClose}>
+          <FormattedMessage id='report.close' defaultMessage='Done' />
+        </Button>
+        <span className='dialog-modal__header__title'>
+          <FormattedMessage id='status.embed' defaultMessage='Get embed code' />
+        </span>
+        <Button secondary onClick={onClose}>
+          <FormattedMessage
+            id='confirmation_modal.cancel'
+            defaultMessage='Cancel'
+          />
+        </Button>
+      </div>
+
+      <div className='dialog-modal__content'>
+        <div className='dialog-modal__content__form'>
+          <FormattedMessage
+            id='embed.instructions'
+            defaultMessage='Embed this status on your website by copying the code below.'
+          />
+
+          <CopyPasteText value={oembed?.html ?? ''} />
+
+          <FormattedMessage
+            id='embed.preview'
+            defaultMessage='Here is what it will look like:'
+          />
+
+          <iframe
+            frameBorder='0'
+            ref={iframeRef}
+            sandbox='allow-scripts allow-same-origin'
+            title='Preview'
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default EmbedModal;
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 39ee7b858f..1de2dce440 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -789,7 +789,7 @@
   "status.edit": "Edit",
   "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
+  "status.embed": "Get embed code",
   "status.favourite": "Favorite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c6ce8f55ab..8adad2441a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1730,6 +1730,10 @@ body > [data-popper-placement] {
     width: 100%;
     height: 100%;
   }
+
+  .detailed-status {
+    border-top: 0;
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
@@ -6289,6 +6293,50 @@ a.status-card {
   }
 }
 
+.dialog-modal {
+  width: 588px;
+  max-height: 80vh;
+  flex-direction: column;
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  border-radius: 16px;
+
+  &__header {
+    border-bottom: 1px solid var(--modal-border-color);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-direction: row-reverse;
+    padding: 12px 24px;
+
+    &__title {
+      font-size: 16px;
+      line-height: 24px;
+      font-weight: 500;
+      letter-spacing: 0.15px;
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    overflow-y: auto;
+
+    &__form {
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      padding: 24px;
+    }
+  }
+
+  .copy-paste-text {
+    margin-bottom: 0;
+  }
+}
+
 .hotkey-combination {
   display: inline-flex;
   align-items: center;
@@ -7737,69 +7785,6 @@ noscript {
   }
 }
 
-.embed-modal {
-  width: auto;
-  max-width: 80vw;
-  max-height: 80vh;
-
-  h4 {
-    padding: 30px;
-    font-weight: 500;
-    font-size: 16px;
-    text-align: center;
-  }
-
-  .embed-modal__container {
-    padding: 10px;
-
-    .hint {
-      margin-bottom: 15px;
-    }
-
-    .embed-modal__html {
-      outline: 0;
-      box-sizing: border-box;
-      display: block;
-      width: 100%;
-      border: 0;
-      padding: 10px;
-      font-family: $font-monospace, monospace;
-      background: $ui-base-color;
-      color: $primary-text-color;
-      font-size: 14px;
-      margin: 0;
-      margin-bottom: 15px;
-      border-radius: 4px;
-
-      &::-moz-focus-inner {
-        border: 0;
-      }
-
-      &::-moz-focus-inner,
-      &:focus,
-      &:active {
-        outline: 0 !important;
-      }
-
-      &:focus {
-        background: lighten($ui-base-color, 4%);
-      }
-
-      @media screen and (width <= 600px) {
-        font-size: 16px;
-      }
-    }
-
-    .embed-modal__iframe {
-      width: 400px;
-      max-width: 100%;
-      overflow: hidden;
-      border: 0;
-      border-radius: 4px;
-    }
-  }
-}
-
 .moved-account-banner,
 .follow-request-banner,
 .account-memorial-banner {
diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb
index 3882b0e305..19fa5ddec7 100644
--- a/app/serializers/oembed_serializer.rb
+++ b/app/serializers/oembed_serializer.rb
@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class OEmbedSerializer < ActiveModel::Serializer
+  INLINE_STYLES = {
+    blockquote: 'max-width: 540px; min-width: 270px; background:#FCF8FF; border: 1px solid #C9C4DA; border-radius: 8px; overflow: hidden; margin: 0; padding: 0;',
+    a: "color: #1C1A25; text-decoration: none; display: flex; align-items: center; justify-content: center; flex-direction: column; padding: 24px; font-size: 14px; line-height: 20px; letter-spacing: 0.25px; font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Roboto, sans-serif;", # rubocop:disable Layout/LineLength
+    div0: 'margin-top: 16px; color: #787588;',
+    div1: 'font-weight: 500;',
+  }.freeze
+
   include RoutingHelper
   include ActionView::Helpers::TagHelper
 
@@ -38,14 +45,14 @@ class OEmbedSerializer < ActiveModel::Serializer
 
   def html
     <<~HTML.squish
-      <blockquote class="mastodon-embed" data-embed-url="#{embed_short_account_status_url(object.account, object)}" style="max-width: 540px; min-width: 270px; background:#FCF8FF; border: 1px solid #C9C4DA; border-radius: 8px; overflow: hidden; margin: 0; padding: 0;">
-        <a href="#{short_account_status_url(object.account, object)}" target="_blank" style="color: #1C1A25; text-decoration: none; display: flex; align-items: center; justify-content: center; flex-direction: column; padding: 24px; font-size: 14px; line-height: 20px; letter-spacing: 0.25px; font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', Roboto, sans-serif;">
+      <blockquote class="mastodon-embed" data-embed-url="#{embed_short_account_status_url(object.account, object)}" style="#{INLINE_STYLES[:blockquote]}">
+        <a href="#{short_account_status_url(object.account, object)}" target="_blank" style="#{INLINE_STYLES[:a]}">
           <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 79 75"><path d="M74.7135 16.6043C73.6199 8.54587 66.5351 2.19527 58.1366 0.964691C56.7196 0.756754 51.351 0 38.9148 0H38.822C26.3824 0 23.7135 0.756754 22.2966 0.964691C14.1319 2.16118 6.67571 7.86752 4.86669 16.0214C3.99657 20.0369 3.90371 24.4888 4.06535 28.5726C4.29578 34.4289 4.34049 40.275 4.877 46.1075C5.24791 49.9817 5.89495 53.8251 6.81328 57.6088C8.53288 64.5968 15.4938 70.4122 22.3138 72.7848C29.6155 75.259 37.468 75.6697 44.9919 73.971C45.8196 73.7801 46.6381 73.5586 47.4475 73.3063C49.2737 72.7302 51.4164 72.086 52.9915 70.9542C53.0131 70.9384 53.0308 70.9178 53.0433 70.8942C53.0558 70.8706 53.0628 70.8445 53.0637 70.8179V65.1661C53.0634 65.1412 53.0574 65.1167 53.0462 65.0944C53.035 65.0721 53.0189 65.0525 52.9992 65.0371C52.9794 65.0218 52.9564 65.011 52.9318 65.0056C52.9073 65.0002 52.8819 65.0003 52.8574 65.0059C48.0369 66.1472 43.0971 66.7193 38.141 66.7103C29.6118 66.7103 27.3178 62.6981 26.6609 61.0278C26.1329 59.5842 25.7976 58.0784 25.6636 56.5486C25.6622 56.5229 25.667 56.4973 25.6775 56.4738C25.688 56.4502 25.7039 56.4295 25.724 56.4132C25.7441 56.397 25.7678 56.3856 25.7931 56.3801C25.8185 56.3746 25.8448 56.3751 25.8699 56.3816C30.6101 57.5151 35.4693 58.0873 40.3455 58.086C41.5183 58.086 42.6876 58.086 43.8604 58.0553C48.7647 57.919 53.9339 57.6701 58.7591 56.7361C58.8794 56.7123 58.9998 56.6918 59.103 56.6611C66.7139 55.2124 73.9569 50.665 74.6929 39.1501C74.7204 38.6967 74.7892 34.4016 74.7892 33.9312C74.7926 32.3325 75.3085 22.5901 74.7135 16.6043ZM62.9996 45.3371H54.9966V25.9069C54.9966 21.8163 53.277 19.7302 49.7793 19.7302C45.9343 19.7302 44.0083 22.1981 44.0083 27.0727V37.7082H36.0534V27.0727C36.0534 22.1981 34.124 19.7302 30.279 19.7302C26.8019 19.7302 25.0651 21.8163 25.0617 25.9069V45.3371H17.0656V25.3172C17.0656 21.2266 18.1191 17.9769 20.2262 15.568C22.3998 13.1648 25.2509 11.9308 28.7898 11.9308C32.8859 11.9308 35.9812 13.492 38.0447 16.6111L40.036 19.9245L42.0308 16.6111C44.0943 13.492 47.1896 11.9308 51.2788 11.9308C54.8143 11.9308 57.6654 13.1648 59.8459 15.568C61.9529 17.9746 63.0065 21.2243 63.0065 25.3172L62.9996 45.3371Z" fill="currentColor"/></svg>
-          <div style="margin-top: 16px; color: #787588;">Post by @#{object.account.pretty_acct}@#{provider_name}</div>
-          <div style="font-weight: 500;">View on Mastodon</div>
+          <div style="#{INLINE_STYLES[:div0]}">Post by @#{object.account.pretty_acct}@#{provider_name}</div>
+          <div style="#{INLINE_STYLES[:div1]}">View on Mastodon</div>
         </a>
       </blockquote>
-      <script data-allowed-prefixes="#{root_url}" src="#{full_asset_url('embed.js', skip_pipeline: true)}" async="true"></script>
+      <script data-allowed-prefixes="#{root_url}" async src="#{full_asset_url('embed.js', skip_pipeline: true)}"></script>
     HTML
   end
 
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 0237e04515..c3de1bcd01 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -11,7 +11,7 @@
     - if storage_host?
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
-    = theme_style_tags Setting.theme # Use the admin-configured theme here, even if logged in
+    = theme_style_tags 'mastodon-light'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = preload_pack_asset "locale/#{I18n.locale}-json.js"
     = render_initial_state
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index e43e38786c..7f34d93eee 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -38,17 +38,16 @@ Rails.application.config.content_security_policy do |p|
   p.img_src         :self, :data, :blob, *media_hosts
   p.style_src       :self, assets_host
   p.media_src       :self, :data, *media_hosts
-  p.frame_src       :self, :https
   p.manifest_src    :self, assets_host
 
   if sso_host.present?
-    p.form_action     :self, sso_host
+    p.form_action :self, sso_host
   else
-    p.form_action     :self
+    p.form_action :self
   end
 
-  p.child_src       :self, :blob, assets_host
-  p.worker_src      :self, :blob, assets_host
+  p.child_src  :self, :blob, assets_host
+  p.worker_src :self, :blob, assets_host
 
   if Rails.env.development?
     webpacker_public_host = ENV.fetch('WEBPACKER_DEV_SERVER_PUBLIC', Webpacker.config.dev_server[:public])
@@ -56,9 +55,11 @@ Rails.application.config.content_security_policy do |p|
 
     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
+    p.frame_src   :self, :https, :http
   else
     p.connect_src :self, :data, :blob, *media_hosts, Rails.configuration.x.streaming_api_base_url
     p.script_src  :self, assets_host, "'wasm-unsafe-eval'"
+    p.frame_src   :self, :https
   end
 end
 

From c35ea59ee6be05fbb7af57e339a493f363200103 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 14:58:12 +0200
Subject: [PATCH 30/89] Fix security context sometimes not being added in
 LD-Signed activities (#31871)

---
 app/lib/activitypub/linked_data_signature.rb       | 9 ++++++++-
 spec/lib/activitypub/linked_data_signature_spec.rb | 9 ++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index 9459fdd8b7..c42313b05e 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -4,6 +4,7 @@ class ActivityPub::LinkedDataSignature
   include JsonLdHelper
 
   CONTEXT = 'https://w3id.org/identity/v1'
+  SIGNATURE_CONTEXT = 'https://w3id.org/security/v1'
 
   def initialize(json)
     @json = json.with_indifferent_access
@@ -46,7 +47,13 @@ class ActivityPub::LinkedDataSignature
 
     signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest.new('SHA256'), to_be_signed))
 
-    @json.merge('signature' => options.merge('signatureValue' => signature))
+    # Mastodon's context is either an array or a single URL
+    context_with_security = Array(@json['@context'])
+    context_with_security << 'https://w3id.org/security/v1'
+    context_with_security.uniq!
+    context_with_security = context_with_security.first if context_with_security.size == 1
+
+    @json.merge('signature' => options.merge('signatureValue' => signature), '@context' => context_with_security)
   end
 
   private
diff --git a/spec/lib/activitypub/linked_data_signature_spec.rb b/spec/lib/activitypub/linked_data_signature_spec.rb
index 1af45673c0..b1a8dc5c49 100644
--- a/spec/lib/activitypub/linked_data_signature_spec.rb
+++ b/spec/lib/activitypub/linked_data_signature_spec.rb
@@ -95,16 +95,11 @@ RSpec.describe ActivityPub::LinkedDataSignature do
   describe '#sign!' do
     subject { described_class.new(raw_json).sign!(sender) }
 
-    it 'returns a hash' do
+    it 'returns a hash with a signature, the expected context, and the signature can be verified', :aggregate_failures do
       expect(subject).to be_a Hash
-    end
-
-    it 'contains signature' do
       expect(subject['signature']).to be_a Hash
       expect(subject['signature']['signatureValue']).to be_present
-    end
-
-    it 'can be verified again' do
+      expect(Array(subject['@context'])).to include('https://w3id.org/security/v1')
       expect(described_class.new(subject).verify_actor!).to eq sender
     end
   end

From 5f782f9629de25a2029fbc75d79316d583adc9a0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 15:15:05 +0200
Subject: [PATCH 31/89] Autofocus primary button in modals (#31883)

---
 .../mastodon/features/ui/components/block_modal.jsx          | 2 +-
 .../ui/components/confirmation_modals/confirmation_modal.tsx | 5 ++++-
 .../mastodon/features/ui/components/domain_block_modal.jsx   | 2 +-
 .../mastodon/features/ui/components/mute_modal.jsx           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/block_modal.jsx b/app/javascript/mastodon/features/ui/components/block_modal.jsx
index fc9233a9cc..d6fc6c4154 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/block_modal.jsx
@@ -99,7 +99,7 @@ export const BlockModal = ({ accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
index c3a0c0aa76..ab567c697a 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -71,7 +71,10 @@ export const ConfirmationModal: React.FC<
             />
           </button>
 
-          <Button onClick={handleClick}>{confirm}</Button>
+          {/* eslint-disable-next-line jsx-a11y/no-autofocus -- we are in a modal and thus autofocusing is justified */}
+          <Button onClick={handleClick} autoFocus>
+            {confirm}
+          </Button>
         </div>
       </div>
     </div>
diff --git a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
index e69db63489..78d5cbb130 100644
--- a/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/domain_block_modal.jsx
@@ -88,7 +88,7 @@ export const DomainBlockModal = ({ domain, accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
           </Button>
         </div>
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.jsx b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
index df466cfac6..70d95b5931 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.jsx
@@ -137,7 +137,7 @@ export const MuteModal = ({ accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>

From a496aeabcb28b7cc7d8a9e69bf47543c2be038c2 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 15:24:19 +0200
Subject: [PATCH 32/89] Change form-action Content-Security-Policy directive to
 be more restrictive (#26897)

---
 .../concerns/web_app_controller_concern.rb    | 10 +++++++++
 app/lib/content_security_policy.rb            | 16 ++++++++++++++
 .../initializers/content_security_policy.rb   | 22 ++-----------------
 spec/requests/content_security_policy_spec.rb |  2 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/controllers/concerns/web_app_controller_concern.rb b/app/controllers/concerns/web_app_controller_concern.rb
index b8c909877b..e1f599dcb0 100644
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@@ -8,6 +8,16 @@ module WebAppControllerConcern
 
     before_action :redirect_unauthenticated_to_permalinks!
     before_action :set_app_body_class
+
+    content_security_policy do |p|
+      policy = ContentSecurityPolicy.new
+
+      if policy.sso_host.present?
+        p.form_action policy.sso_host
+      else
+        p.form_action :none
+      end
+    end
   end
 
   def skip_csrf_meta_tags?
diff --git a/app/lib/content_security_policy.rb b/app/lib/content_security_policy.rb
index 210f37cea0..0b60b0d98c 100644
--- a/app/lib/content_security_policy.rb
+++ b/app/lib/content_security_policy.rb
@@ -13,6 +13,22 @@ class ContentSecurityPolicy
     [assets_host, cdn_host_value, paperclip_root_url].compact
   end
 
+  def sso_host
+    return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true' && ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1
+
+    provider = Devise.omniauth_configs[Devise.omniauth_providers[0]]
+    @sso_host ||= begin
+      case provider.provider
+      when :cas
+        provider.cas_url
+      when :saml
+        provider.options[:idp_sso_target_url]
+      when :openid_connect
+        provider.options.dig(:client_options, :authorization_endpoint) || OpenIDConnect::Discovery::Provider::Config.discover!(provider.options[:issuer]).authorization_endpoint
+      end
+    end
+  end
+
   private
 
   def url_from_configured_asset_host
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 7f34d93eee..9f4a41e3ab 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -12,24 +12,6 @@ policy = ContentSecurityPolicy.new
 assets_host = policy.assets_host
 media_hosts = policy.media_hosts
 
-def sso_host
-  return unless ENV['ONE_CLICK_SSO_LOGIN'] == 'true'
-  return unless ENV['OMNIAUTH_ONLY'] == 'true'
-  return unless Devise.omniauth_providers.length == 1
-
-  provider = Devise.omniauth_configs[Devise.omniauth_providers[0]]
-  @sso_host ||= begin
-    case provider.provider
-    when :cas
-      provider.cas_url
-    when :saml
-      provider.options[:idp_sso_target_url]
-    when :openid_connect
-      provider.options.dig(:client_options, :authorization_endpoint) || OpenIDConnect::Discovery::Provider::Config.discover!(provider.options[:issuer]).authorization_endpoint
-    end
-  end
-end
-
 Rails.application.config.content_security_policy do |p|
   p.base_uri        :none
   p.default_src     :none
@@ -40,8 +22,8 @@ Rails.application.config.content_security_policy do |p|
   p.media_src       :self, :data, *media_hosts
   p.manifest_src    :self, assets_host
 
-  if sso_host.present?
-    p.form_action :self, sso_host
+  if policy.sso_host.present?
+    p.form_action :self, policy.sso_host
   else
     p.form_action :self
   end
diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb
index 7520ecb0db..2bbbdd841e 100644
--- a/spec/requests/content_security_policy_spec.rb
+++ b/spec/requests/content_security_policy_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe 'Content-Security-Policy' do
       connect-src 'self' data: blob: https://cb6e6126.ngrok.io #{Rails.configuration.x.streaming_api_base_url}
       default-src 'none'
       font-src 'self' https://cb6e6126.ngrok.io
-      form-action 'self'
+      form-action 'none'
       frame-ancestors 'none'
       frame-src 'self' https:
       img-src 'self' data: blob: https://cb6e6126.ngrok.io

From 17c57c46e7f54f32ad7b17b86c7b936c789ca799 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 12 Sep 2024 09:25:23 -0400
Subject: [PATCH 33/89] Add coverage for title/limit validations in `List`
 model (#31869)

---
 app/models/list.rb       | 10 ++++++----
 spec/models/list_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 spec/models/list_spec.rb

diff --git a/app/models/list.rb b/app/models/list.rb
index b45bd057bc..d4915f56fa 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -20,21 +20,23 @@ class List < ApplicationRecord
 
   enum :replies_policy, { list: 0, followed: 1, none: 2 }, prefix: :show
 
-  belongs_to :account, optional: true
+  belongs_to :account
 
   has_many :list_accounts, inverse_of: :list, dependent: :destroy
   has_many :accounts, through: :list_accounts
 
   validates :title, presence: true
 
-  validates_each :account_id, on: :create do |record, _attr, value|
-    record.errors.add(:base, I18n.t('lists.errors.limit')) if List.where(account_id: value).count >= PER_ACCOUNT_LIMIT
-  end
+  validate :validate_account_lists_limit, on: :create
 
   before_destroy :clean_feed_manager
 
   private
 
+  def validate_account_lists_limit
+    errors.add(:base, I18n.t('lists.errors.limit')) if account.lists.count >= PER_ACCOUNT_LIMIT
+  end
+
   def clean_feed_manager
     FeedManager.instance.clean_feeds!(:list, [id])
   end
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
new file mode 100644
index 0000000000..62a84dfebf
--- /dev/null
+++ b/spec/models/list_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe List do
+  describe 'Validations' do
+    subject { Fabricate.build :list }
+
+    it { is_expected.to validate_presence_of(:title) }
+
+    context 'when account has hit max list limit' do
+      let(:account) { Fabricate :account }
+
+      before { stub_const 'List::PER_ACCOUNT_LIMIT', 0 }
+
+      context 'when creating a new list' do
+        it { is_expected.to_not allow_value(account).for(:account).against(:base).with_message(I18n.t('lists.errors.limit')) }
+      end
+
+      context 'when updating an existing list' do
+        before { subject.save(validate: false) }
+
+        it { is_expected.to allow_value(account).for(:account).against(:base) }
+      end
+    end
+  end
+end

From 8cdc1481679ef0c7a848d488dae1a265cdcfeac1 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <github@chsc.dk>
Date: Thu, 12 Sep 2024 15:29:55 +0200
Subject: [PATCH 34/89] Handle invalid visibility (#31571)

---
 app/models/status.rb                      |  2 +-
 spec/services/post_status_service_spec.rb | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 73f0052673..e0630733d8 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -52,7 +52,7 @@ class Status < ApplicationRecord
   update_index('statuses', :proper)
   update_index('public_statuses', :proper)
 
-  enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, suffix: :visibility
+  enum :visibility, { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4 }, suffix: :visibility, validate: true
 
   belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 7e44789628..26db398d5e 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -68,7 +68,10 @@ RSpec.describe PostStatusService do
       it 'raises invalid record error' do
         expect do
           subject.call(account, text: 'Hi future!', scheduled_at: invalid_scheduled_time)
-        end.to raise_error(ActiveRecord::RecordInvalid)
+        end.to raise_error(
+          ActiveRecord::RecordInvalid,
+          'Validation failed: Scheduled at The scheduled date must be in the future'
+        )
       end
     end
   end
@@ -123,6 +126,15 @@ RSpec.describe PostStatusService do
     expect(status.visibility).to eq 'private'
   end
 
+  it 'raises on an invalid visibility' do
+    expect do
+      create_status_with_options(visibility: :xxx)
+    end.to raise_error(
+      ActiveRecord::RecordInvalid,
+      'Validation failed: Visibility is not included in the list'
+    )
+  end
+
   it 'creates a status with limited visibility for silenced users' do
     status = subject.call(Fabricate(:account, silenced: true), text: 'test', visibility: :public)
 

From 4aa600387e71bca60331d672dc5c15ba58886006 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 12 Sep 2024 09:31:50 -0400
Subject: [PATCH 35/89] Move redirect/base body class to view (#31796)

---
 app/controllers/redirect/base_controller.rb |  5 ---
 app/views/redirects/show.html.haml          |  2 ++
 spec/system/redirections_spec.rb            | 38 ++++++++++++---------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/controllers/redirect/base_controller.rb b/app/controllers/redirect/base_controller.rb
index 90894ec1ed..34558a4126 100644
--- a/app/controllers/redirect/base_controller.rb
+++ b/app/controllers/redirect/base_controller.rb
@@ -4,7 +4,6 @@ class Redirect::BaseController < ApplicationController
   vary_by 'Accept-Language'
 
   before_action :set_resource
-  before_action :set_app_body_class
 
   def show
     @redirect_path = ActivityPub::TagManager.instance.url_for(@resource)
@@ -14,10 +13,6 @@ class Redirect::BaseController < ApplicationController
 
   private
 
-  def set_app_body_class
-    @body_classes = 'app-body'
-  end
-
   def set_resource
     raise NotImplementedError
   end
diff --git a/app/views/redirects/show.html.haml b/app/views/redirects/show.html.haml
index 64436e05d1..aa0db350a8 100644
--- a/app/views/redirects/show.html.haml
+++ b/app/views/redirects/show.html.haml
@@ -2,6 +2,8 @@
   %meta{ name: 'robots', content: 'noindex, noarchive' }/
   %link{ rel: 'canonical', href: @redirect_path }
 
+- content_for :body_classes, 'app-body'
+
 .redirect
   .redirect__logo
     = link_to render_logo, root_path
diff --git a/spec/system/redirections_spec.rb b/spec/system/redirections_spec.rb
index 860bbdd6b7..eba034326b 100644
--- a/spec/system/redirections_spec.rb
+++ b/spec/system/redirections_spec.rb
@@ -6,27 +6,31 @@ RSpec.describe 'redirection confirmations' do
   let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/foo', url: 'https://example.com/@foo') }
   let(:status)  { Fabricate(:status, account: account, uri: 'https://example.com/users/foo/statuses/1', url: 'https://example.com/@foo/1') }
 
-  context 'when a logged out user visits a local page for a remote account' do
-    it 'shows a confirmation page' do
-      visit "/@#{account.pretty_acct}"
+  context 'when logged out' do
+    describe 'a local page for a remote account' do
+      it 'shows a confirmation page with relevant content' do
+        visit "/@#{account.pretty_acct}"
 
-      # It explains about the redirect
-      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
+        expect(page)
+          .to have_content(redirect_title) # Redirect explanation
+          .and have_link(account.url, href: account.url) # Appropriate account link
+          .and have_css('body', class: 'app-body')
+      end
+    end
 
-      # It features an appropriate link
-      expect(page).to have_link(account.url, href: account.url)
+    describe 'a local page for a remote status' do
+      it 'shows a confirmation page with relevant content' do
+        visit "/@#{account.pretty_acct}/#{status.id}"
+
+        expect(page)
+          .to have_content(redirect_title) # Redirect explanation
+          .and have_link(status.url, href: status.url) # Appropriate status link
+          .and have_css('body', class: 'app-body')
+      end
     end
   end
 
-  context 'when a logged out user visits a local page for a remote status' do
-    it 'shows a confirmation page' do
-      visit "/@#{account.pretty_acct}/#{status.id}"
-
-      # It explains about the redirect
-      expect(page).to have_content(I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io'))
-
-      # It features an appropriate link
-      expect(page).to have_link(status.url, href: status.url)
-    end
+  def redirect_title
+    I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io')
   end
 end

From f3c48745225fa4a0f21efbfa530e84e34bb56a97 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 12 Sep 2024 09:38:15 -0400
Subject: [PATCH 36/89] Remove unused `statuses#embed` body class assignment
 (#31787)

---
 app/controllers/statuses_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index a0885b469b..341b0e6472 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -11,7 +11,6 @@ class StatusesController < ApplicationController
   before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_status
   before_action :redirect_to_original, only: :show
-  before_action :set_body_classes, only: :embed
 
   after_action :set_link_headers
 
@@ -51,10 +50,6 @@ class StatusesController < ApplicationController
 
   private
 
-  def set_body_classes
-    @body_classes = 'with-modals'
-  end
-
   def set_link_headers
     response.headers['Link'] = LinkHeader.new(
       [[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]]

From 1b6a82b7994e436d145b0e2282af07314fe54308 Mon Sep 17 00:00:00 2001
From: Taylor Chaparro <33099255+notchairmk@users.noreply.github.com>
Date: Thu, 12 Sep 2024 06:40:20 -0700
Subject: [PATCH 37/89] Fix invalid date searches returning 503 (#31526)

---
 app/lib/search_query_transformer.rb       | 17 +++++--
 lib/exceptions.rb                         |  1 +
 spec/lib/search_query_transformer_spec.rb | 57 +++++++++++++++++++++--
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/app/lib/search_query_transformer.rb b/app/lib/search_query_transformer.rb
index 606819ed40..1306ed12ed 100644
--- a/app/lib/search_query_transformer.rb
+++ b/app/lib/search_query_transformer.rb
@@ -168,15 +168,15 @@ class SearchQueryTransformer < Parslet::Transform
       when 'before'
         @filter = :created_at
         @type = :range
-        @term = { lt: term, time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { lt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'after'
         @filter = :created_at
         @type = :range
-        @term = { gt: term, time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { gt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'during'
         @filter = :created_at
         @type = :range
-        @term = { gte: term, lte: term, time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { gte: TermValidator.validate_date!(term), lte: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'in'
         @operator = :flag
         @term = term
@@ -224,6 +224,17 @@ class SearchQueryTransformer < Parslet::Transform
     end
   end
 
+  class TermValidator
+    STRICT_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}\z/ # yyyy-MM-dd
+    EPOCH_MILLIS_REGEX = /\A\d{1,19}\z/
+
+    def self.validate_date!(value)
+      return value if value.match?(STRICT_DATE_REGEX) || value.match?(EPOCH_MILLIS_REGEX)
+
+      raise Mastodon::FilterValidationError, "Invalid date #{value}"
+    end
+  end
+
   rule(clause: subtree(:clause)) do
     prefix   = clause[:prefix][:term].to_s.downcase if clause[:prefix]
     operator = clause[:operator]&.to_s
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index d3b92f4a09..c2ff162a6e 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -8,6 +8,7 @@ module Mastodon
   class LengthValidationError < ValidationError; end
   class DimensionsValidationError < ValidationError; end
   class StreamValidationError < ValidationError; end
+  class FilterValidationError < ValidationError; end
   class RaceConditionError < Error; end
   class RateLimitExceededError < Error; end
   class SyntaxError < Error; end
diff --git a/spec/lib/search_query_transformer_spec.rb b/spec/lib/search_query_transformer_spec.rb
index 00220f84fd..9399f3503d 100644
--- a/spec/lib/search_query_transformer_spec.rb
+++ b/spec/lib/search_query_transformer_spec.rb
@@ -8,6 +8,37 @@ RSpec.describe SearchQueryTransformer do
   let(:account) { Fabricate(:account) }
   let(:parser) { SearchQueryParser.new.parse(query) }
 
+  shared_examples 'date operator' do |operator|
+    let(:statement_operations) { [] }
+
+    [
+      ['2022-01-01', '2022-01-01'],
+      ['"2022-01-01"', '2022-01-01'],
+      ['12345678', '12345678'],
+      ['"12345678"', '12345678'],
+    ].each do |value, parsed|
+      context "with #{operator}:#{value}" do
+        let(:query) { "#{operator}:#{value}" }
+
+        it 'transforms clauses' do
+          ops = statement_operations.index_with { |_op| parsed }
+
+          expect(subject.send(:must_clauses)).to be_empty
+          expect(subject.send(:must_not_clauses)).to be_empty
+          expect(subject.send(:filter_clauses).map(&:term)).to contain_exactly(**ops, time_zone: 'UTC')
+        end
+      end
+    end
+
+    context "with #{operator}:\"abc\"" do
+      let(:query) { "#{operator}:\"abc\"" }
+
+      it 'raises an exception' do
+        expect { subject }.to raise_error(Mastodon::FilterValidationError, 'Invalid date abc')
+      end
+    end
+  end
+
   context 'with "hello world"' do
     let(:query) { 'hello world' }
 
@@ -68,13 +99,33 @@ RSpec.describe SearchQueryTransformer do
     end
   end
 
-  context 'with \'before:"2022-01-01 23:00"\'' do
-    let(:query) { 'before:"2022-01-01 23:00"' }
+  context 'with \'is:"foo bar"\'' do
+    let(:query) { 'is:"foo bar"' }
 
     it 'transforms clauses' do
       expect(subject.send(:must_clauses)).to be_empty
       expect(subject.send(:must_not_clauses)).to be_empty
-      expect(subject.send(:filter_clauses).map(&:term)).to contain_exactly(lt: '2022-01-01 23:00', time_zone: 'UTC')
+      expect(subject.send(:filter_clauses).map(&:term)).to contain_exactly('foo bar')
+    end
+  end
+
+  context 'with date operators' do
+    context 'with "before"' do
+      it_behaves_like 'date operator', 'before' do
+        let(:statement_operations) { [:lt] }
+      end
+    end
+
+    context 'with "after"' do
+      it_behaves_like 'date operator', 'after' do
+        let(:statement_operations) { [:gt] }
+      end
+    end
+
+    context 'with "during"' do
+      it_behaves_like 'date operator', 'during' do
+        let(:statement_operations) { [:gte, :lte] }
+      end
     end
   end
 end

From 207c073bf87855c02a218526a3a389fc851e6c25 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 12 Sep 2024 10:04:46 -0400
Subject: [PATCH 38/89] Remove debug output in migration controller spec
 (#31886)

---
 spec/controllers/settings/migrations_controller_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index 67d5ab54f0..93c5de0899 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -95,7 +95,6 @@ RSpec.describe Settings::MigrationsController do
 
         before do
           moved_to = Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(user.account)])
-          p moved_to.acct
           user.account.migrations.create!(acct: moved_to.acct)
         end
 

From a269ff9253050fb9a0b2c063c253eacfad77b738 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 12 Sep 2024 09:18:43 -0500
Subject: [PATCH 39/89] Fix review history and action modal styling (#31864)

---
 .../styles/mastodon-light/diff.scss           | 27 -------------------
 .../styles/mastodon/components.scss           | 11 +++++---
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index c0cabf837c..45da56994c 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -147,33 +147,6 @@
   border-top-color: lighten($ui-base-color, 4%);
 }
 
-// Change the background colors of modals
-.actions-modal,
-.boost-modal,
-.confirmation-modal,
-.mute-modal,
-.block-modal,
-.report-modal,
-.report-dialog-modal,
-.embed-modal,
-.error-modal,
-.onboarding-modal,
-.compare-history-modal,
-.report-modal__comment,
-.report-modal__comment,
-.announcements,
-.picture-in-picture__header,
-.picture-in-picture__footer,
-.reactions-bar__item {
-  background: $white;
-  border: 1px solid var(--background-border-color);
-}
-
-.setting-text__wrapper,
-.setting-text {
-  border: 1px solid var(--background-border-color);
-}
-
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8adad2441a..a53eef52c4 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6362,6 +6362,11 @@ a.status-card {
   width: 480px;
   position: relative;
   flex-direction: column;
+
+  @media screen and (max-width: $no-columns-breakpoint) {
+    border-bottom: 0;
+    border-radius: 4px 4px 0 0;
+  }
 }
 
 .boost-modal__container {
@@ -6759,7 +6764,7 @@ a.status-card {
 
     li:not(:empty) {
       a {
-        color: $inverted-text-color;
+        color: $primary-text-color;
         display: flex;
         padding: 12px 16px;
         font-size: 15px;
@@ -6839,7 +6844,7 @@ a.status-card {
 
 .compare-history-modal {
   .report-modal__target {
-    border-bottom: 1px solid $ui-secondary-color;
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   &__container {
@@ -6849,7 +6854,7 @@ a.status-card {
   }
 
   .status__content {
-    color: $inverted-text-color;
+    color: $secondary-text-color;
     font-size: 19px;
     line-height: 24px;
 

From cc3cf9c4656460dbf3b93de0e95c4dc29e454cb2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:20:44 +0000
Subject: [PATCH 40/89] Update dependency aws-sdk-s3 to v1.162.0 (#31875)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1564c267b8..206178a530 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,17 +100,17 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.973.0)
-    aws-sdk-core (3.204.0)
+    aws-partitions (1.974.0)
+    aws-sdk-core (3.205.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.90.0)
-      aws-sdk-core (~> 3, >= 3.203.0)
+    aws-sdk-kms (1.91.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.161.0)
-      aws-sdk-core (~> 3, >= 3.203.0)
+    aws-sdk-s3 (1.162.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)

From 0226bbe5165a53658b29e46ddbef6a10507fdc8c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:21:06 +0000
Subject: [PATCH 41/89] Update dependency express to v4.21.0 (#31877)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 91 ++++++++++++-------------------------------------------
 1 file changed, 19 insertions(+), 72 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f498a5560e..50443c6db9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -82,19 +82,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
-  version: 7.25.0
-  resolution: "@babel/generator@npm:7.25.0"
-  dependencies:
-    "@babel/types": "npm:^7.25.0"
-    "@jridgewell/gen-mapping": "npm:^0.3.5"
-    "@jridgewell/trace-mapping": "npm:^0.3.25"
-    jsesc: "npm:^2.5.1"
-  checksum: 10c0/d0e2dfcdc8bdbb5dded34b705ceebf2e0bc1b06795a1530e64fb6a3ccf313c189db7f60c1616effae48114e1a25adc75855bc4496f3779a396b3377bae718ce7
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.25.4":
+"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4, @babel/generator@npm:^7.7.2":
   version: 7.25.4
   resolution: "@babel/generator@npm:7.25.4"
   dependencies:
@@ -1533,18 +1521,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
-  version: 7.25.2
-  resolution: "@babel/types@npm:7.25.2"
-  dependencies:
-    "@babel/helper-string-parser": "npm:^7.24.8"
-    "@babel/helper-validator-identifier": "npm:^7.24.7"
-    to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/e489435856be239f8cc1120c90a197e4c2865385121908e5edb7223cfdff3768cba18f489adfe0c26955d9e7bbb1fb10625bc2517505908ceb0af848989bd864
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.25.4":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-beta.49, @babel/types@npm:^7.12.11, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
   version: 7.25.4
   resolution: "@babel/types@npm:7.25.4"
   dependencies:
@@ -8364,8 +8341,8 @@ __metadata:
   linkType: hard
 
 "express@npm:^4.17.1, express@npm:^4.18.2":
-  version: 4.20.0
-  resolution: "express@npm:4.20.0"
+  version: 4.21.0
+  resolution: "express@npm:4.21.0"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
@@ -8379,7 +8356,7 @@ __metadata:
     encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     etag: "npm:~1.8.1"
-    finalhandler: "npm:1.2.0"
+    finalhandler: "npm:1.3.1"
     fresh: "npm:0.5.2"
     http-errors: "npm:2.0.0"
     merge-descriptors: "npm:1.0.3"
@@ -8388,17 +8365,17 @@ __metadata:
     parseurl: "npm:~1.3.3"
     path-to-regexp: "npm:0.1.10"
     proxy-addr: "npm:~2.0.7"
-    qs: "npm:6.11.0"
+    qs: "npm:6.13.0"
     range-parser: "npm:~1.2.1"
     safe-buffer: "npm:5.2.1"
     send: "npm:0.19.0"
-    serve-static: "npm:1.16.0"
+    serve-static: "npm:1.16.2"
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10c0/626e440e9feffa3f82ebce5e7dc0ad7a74fa96079994f30048cce450f4855a258abbcabf021f691aeb72154867f0d28440a8498c62888805faf667a829fb65aa
+  checksum: 10c0/4cf7ca328f3fdeb720f30ccb2ea7708bfa7d345f9cc460b64a82bf1b2c91e5b5852ba15a9a11b2a165d6089acf83457fc477dc904d59cd71ed34c7a91762c6cc
   languageName: node
   linkType: hard
 
@@ -8600,18 +8577,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"finalhandler@npm:1.2.0":
-  version: 1.2.0
-  resolution: "finalhandler@npm:1.2.0"
+"finalhandler@npm:1.3.1":
+  version: 1.3.1
+  resolution: "finalhandler@npm:1.3.1"
   dependencies:
     debug: "npm:2.6.9"
-    encodeurl: "npm:~1.0.2"
+    encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     on-finished: "npm:2.4.1"
     parseurl: "npm:~1.3.3"
     statuses: "npm:2.0.1"
     unpipe: "npm:~1.0.0"
-  checksum: 10c0/64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
+  checksum: 10c0/d38035831865a49b5610206a3a9a9aae4e8523cbbcd01175d0480ffbf1278c47f11d89be3ca7f617ae6d94f29cf797546a4619cd84dd109009ef33f12f69019f
   languageName: node
   linkType: hard
 
@@ -14354,15 +14331,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:6.11.0":
-  version: 6.11.0
-  resolution: "qs@npm:6.11.0"
-  dependencies:
-    side-channel: "npm:^1.0.4"
-  checksum: 10c0/4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
-  languageName: node
-  linkType: hard
-
 "qs@npm:6.13.0, qs@npm:^6.11.0":
   version: 6.13.0
   resolution: "qs@npm:6.13.0"
@@ -15621,27 +15589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"send@npm:0.18.0":
-  version: 0.18.0
-  resolution: "send@npm:0.18.0"
-  dependencies:
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    encodeurl: "npm:~1.0.2"
-    escape-html: "npm:~1.0.3"
-    etag: "npm:~1.8.1"
-    fresh: "npm:0.5.2"
-    http-errors: "npm:2.0.0"
-    mime: "npm:1.6.0"
-    ms: "npm:2.1.3"
-    on-finished: "npm:2.4.1"
-    range-parser: "npm:~1.2.1"
-    statuses: "npm:2.0.1"
-  checksum: 10c0/0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
-  languageName: node
-  linkType: hard
-
 "send@npm:0.19.0":
   version: 0.19.0
   resolution: "send@npm:0.19.0"
@@ -15696,15 +15643,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-static@npm:1.16.0":
-  version: 1.16.0
-  resolution: "serve-static@npm:1.16.0"
+"serve-static@npm:1.16.2":
+  version: 1.16.2
+  resolution: "serve-static@npm:1.16.2"
   dependencies:
-    encodeurl: "npm:~1.0.2"
+    encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     parseurl: "npm:~1.3.3"
-    send: "npm:0.18.0"
-  checksum: 10c0/d7a5beca08cc55f92998d8b87c111dd842d642404231c90c11f504f9650935da4599c13256747b0a988442a59851343271fe8e1946e03e92cd79c447b5f3ae01
+    send: "npm:0.19.0"
+  checksum: 10c0/528fff6f5e12d0c5a391229ad893910709bc51b5705962b09404a1d813857578149b8815f35d3ee5752f44cd378d0f31669d4b1d7e2d11f41e08283d5134bd1f
   languageName: node
   linkType: hard
 

From eb28472ded0bc0ab8e12e4fbb237744485675ad5 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Tue, 10 Sep 2024 12:33:55 -0500
Subject: [PATCH 42/89] [Glitch] Fix alt text modal styling

Port e09f9f885e3d2859f495d5e5e6107bba9bde3b5a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss      | 16 +++++++++-------
 .../glitch/styles/mastodon-light/diff.scss      | 17 +++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 70f950f3ca..e450b2c5c3 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4098,7 +4098,7 @@ input.glitch-setting-text {
 
   &__wrapper {
     background: $white;
-    border: 1px solid $ui-secondary-color;
+    border: 1px solid var(--background-border-color);
     margin-bottom: 10px;
     border-radius: 4px;
 
@@ -6747,9 +6747,10 @@ a.status-card {
 .report-modal,
 .actions-modal,
 .compare-history-modal {
-  background: lighten($ui-secondary-color, 8%);
-  color: $inverted-text-color;
-  border-radius: 8px;
+  background: var(--background-color);
+  color: $primary-text-color;
+  border-radius: 4px;
+  border: 1px solid var(--background-border-color);
   overflow: hidden;
   max-width: 90vw;
   width: 480px;
@@ -6806,6 +6807,7 @@ a.status-card {
 .report-modal {
   width: 90vw;
   max-width: 700px;
+  border: 1px solid var(--background-border-color);
 }
 
 .report-dialog-modal {
@@ -7029,7 +7031,7 @@ a.status-card {
 
 .report-modal__container {
   display: flex;
-  border-top: 1px solid $ui-secondary-color;
+  border-top: 1px solid var(--background-border-color);
 
   @media screen and (width <= 480px) {
     flex-wrap: wrap;
@@ -7087,7 +7089,7 @@ a.status-card {
 
 .report-modal__comment {
   padding: 20px;
-  border-inline-end: 1px solid $ui-secondary-color;
+  border-inline-end: 1px solid var(--background-border-color);
   max-width: 320px;
 
   p {
@@ -7098,7 +7100,7 @@ a.status-card {
 
   .setting-text-label {
     display: block;
-    color: $inverted-text-color;
+    color: $secondary-text-color;
     font-size: 14px;
     font-weight: 500;
     margin-bottom: 10px;
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 73f3689066..850a67dd2c 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -159,8 +159,8 @@
 .error-modal,
 .onboarding-modal,
 .compare-history-modal,
-.report-modal__comment .setting-text__wrapper,
-.report-modal__comment .setting-text,
+.report-modal__comment,
+.report-modal__comment,
 .announcements,
 .picture-in-picture__header,
 .picture-in-picture__footer,
@@ -169,6 +169,11 @@
   border: 1px solid var(--background-border-color);
 }
 
+.setting-text__wrapper,
+.setting-text {
+  border: 1px solid var(--background-border-color);
+}
+
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {
@@ -198,14 +203,6 @@
   color: $white;
 }
 
-.report-modal__comment {
-  border-right-color: lighten($ui-base-color, 8%);
-}
-
-.report-modal__container {
-  border-top-color: lighten($ui-base-color, 8%);
-}
-
 .column-settings__hashtags .column-select__option {
   color: $white;
 }

From 196b141af5f133978e12e4819097fbd9e699e97a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 11 Sep 2024 09:29:18 +0200
Subject: [PATCH 43/89] [Glitch] Change inner borders in media galleries in web
 UI

Port a3215c0f88bb5f436bed665ad26175923544d9d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/media_gallery.jsx       |  2 +-
 .../flavours/glitch/styles/components.scss    | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx
index 1710ca9691..5be5fb4c58 100644
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@@ -312,7 +312,7 @@ class MediaGallery extends PureComponent {
 
     const style = {};
 
-    const computedClass = classNames('media-gallery', { 'full-width': fullwidth });
+    const computedClass = classNames('media-gallery', `media-gallery--layout-${size}`, { 'full-width': fullwidth });
 
     if (this.isStandaloneEligible()) { // TODO: cropImages setting
       style.aspectRatio = `${this.props.media.getIn([0, 'meta', 'small', 'aspect'])}`;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index e450b2c5c3..c773b991ef 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -7359,6 +7359,64 @@ img.modal-warning {
   inset-inline-start: 8px;
   display: flex;
   gap: 2px;
+
+  &--layout-2 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+    }
+  }
+
+  &--layout-3 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(3) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-start-end-radius: 0;
+    }
+  }
+
+  &--layout-4 {
+    .media-gallery__item:nth-child(1) {
+      border-end-end-radius: 0;
+      border-start-end-radius: 0;
+      border-end-start-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(2) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(3) {
+      border-start-start-radius: 0;
+      border-start-end-radius: 0;
+      border-end-start-radius: 0;
+      border-end-end-radius: 0;
+    }
+
+    .media-gallery__item:nth-child(4) {
+      border-start-start-radius: 0;
+      border-end-start-radius: 0;
+      border-start-end-radius: 0;
+    }
+  }
 }
 
 .media-gallery__alt__label,

From 17e3a12d3d28edaf91176ff70de82400370bd1ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:59:46 +0200
Subject: [PATCH 44/89] [Glitch] Update typescript-eslint monorepo to v8
 (major)

Port a27f7f4e561c9d2fe21d984059603d2f500c005b to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/markers.ts          | 2 +-
 app/javascript/flavours/glitch/actions/streaming.js        | 2 +-
 app/javascript/flavours/glitch/common.js                   | 2 +-
 .../flavours/glitch/components/error_boundary.jsx          | 4 ++--
 .../flavours/glitch/features/interaction_modal/index.jsx   | 2 +-
 .../glitch/features/ui/containers/status_list_container.js | 2 +-
 app/javascript/flavours/glitch/features/ui/index.jsx       | 4 ++--
 app/javascript/flavours/glitch/initial_state.js            | 2 +-
 app/javascript/flavours/glitch/locales/intl_provider.tsx   | 2 +-
 app/javascript/flavours/glitch/settings.js                 | 7 ++++---
 app/javascript/flavours/glitch/store/middlewares/errors.ts | 2 +-
 app/javascript/flavours/glitch/store/middlewares/sounds.ts | 2 +-
 app/javascript/flavours/glitch/utils/content_warning.js    | 2 +-
 13 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 1c1fd60dcf..666756bcd1 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -65,7 +65,7 @@ export const synchronouslySubmitMarkers = createAppAsyncThunk(
       client.setRequestHeader('Content-Type', 'application/json');
       client.setRequestHeader('Authorization', `Bearer ${accessToken}`);
       client.send(JSON.stringify(params));
-    } catch (e) {
+    } catch {
       // Do not make the BeforeUnload handler error out
     }
   },
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index 3584a25625..e6eb7b2fad 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -151,7 +151,7 @@ async function refreshHomeTimelineAndNotification(dispatch, getState) {
     // TODO: polling for merged notifications
     try {
       await dispatch(pollRecentGroupNotifications());
-    } catch (error) {
+    } catch {
       // TODO
     }
   } else {
diff --git a/app/javascript/flavours/glitch/common.js b/app/javascript/flavours/glitch/common.js
index ca4703d38b..71f45dbf3b 100644
--- a/app/javascript/flavours/glitch/common.js
+++ b/app/javascript/flavours/glitch/common.js
@@ -5,7 +5,7 @@ export function start() {
 
   try {
     Rails.start();
-  } catch (e) {
+  } catch {
     // If called twice
   }
 }
diff --git a/app/javascript/flavours/glitch/components/error_boundary.jsx b/app/javascript/flavours/glitch/components/error_boundary.jsx
index 248b866475..9ab48407af 100644
--- a/app/javascript/flavours/glitch/components/error_boundary.jsx
+++ b/app/javascript/flavours/glitch/components/error_boundary.jsx
@@ -60,8 +60,8 @@ export default class ErrorBoundary extends PureComponent {
     try {
       textarea.select();
       document.execCommand('copy');
-    } catch (e) {
-
+    } catch {
+      // do nothing
     } finally {
       document.body.removeChild(textarea);
     }
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
index 71cdf8409c..23244f06ca 100644
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
@@ -131,7 +131,7 @@ class LoginForm extends React.PureComponent {
     try {
       new URL(url);
       return true;
-    } catch(_) {
+    } catch {
       return false;
     }
   };
diff --git a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
index 2d36262be2..59df6ac166 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
@@ -15,7 +15,7 @@ const getRegex = createSelector([
 
   try {
     regex = rawRegex && new RegExp(rawRegex.trim(), 'i');
-  } catch (e) {
+  } catch {
     // Bad regex, don't affect filters
   }
   return regex;
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 7a2aa21f88..0ee191cfb4 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -337,8 +337,8 @@ class UI extends PureComponent {
 
     try {
       e.dataTransfer.dropEffect = 'copy';
-    } catch (err) {
-
+    } catch {
+      // do nothing
     }
 
     return false;
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index 624f8bb101..ee8e901a4f 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -90,7 +90,7 @@ if (initialState) {
   try {
     // @ts-expect-error
     initialState.local_settings = JSON.parse(localStorage.getItem('mastodon-settings'));
-  } catch (e) {
+  } catch {
     initialState.local_settings = {};
   }
 }
diff --git a/app/javascript/flavours/glitch/locales/intl_provider.tsx b/app/javascript/flavours/glitch/locales/intl_provider.tsx
index f508a26be7..1e8a073249 100644
--- a/app/javascript/flavours/glitch/locales/intl_provider.tsx
+++ b/app/javascript/flavours/glitch/locales/intl_provider.tsx
@@ -17,7 +17,7 @@ function onProviderError(error: unknown) {
     error &&
     typeof error === 'object' &&
     error instanceof Error &&
-    error.message.match('MISSING_DATA')
+    /MISSING_DATA/.exec(error.message)
   ) {
     console.warn(error.message);
   }
diff --git a/app/javascript/flavours/glitch/settings.js b/app/javascript/flavours/glitch/settings.js
index f31aee0afc..f4883dc406 100644
--- a/app/javascript/flavours/glitch/settings.js
+++ b/app/javascript/flavours/glitch/settings.js
@@ -14,7 +14,7 @@ export default class Settings {
       const encodedData = JSON.stringify(data);
       localStorage.setItem(key, encodedData);
       return data;
-    } catch (e) {
+    } catch {
       return null;
     }
   }
@@ -24,7 +24,7 @@ export default class Settings {
     try {
       const rawData = localStorage.getItem(key);
       return JSON.parse(rawData);
-    } catch (e) {
+    } catch {
       return null;
     }
   }
@@ -35,7 +35,8 @@ export default class Settings {
       const key = this.generateKey(id);
       try {
         localStorage.removeItem(key);
-      } catch (e) {
+      } catch {
+        // ignore if the key is not found
       }
     }
     return data;
diff --git a/app/javascript/flavours/glitch/store/middlewares/errors.ts b/app/javascript/flavours/glitch/store/middlewares/errors.ts
index e77cec34ed..3ad3844d5b 100644
--- a/app/javascript/flavours/glitch/store/middlewares/errors.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/errors.ts
@@ -30,7 +30,7 @@ function isActionWithmaybeAlertParams(
   return isAction(action);
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type -- we need to use `{}` here to ensure the dispatch types can be merged
 export const errorsMiddleware: Middleware<{}, RootState> =
   ({ dispatch }) =>
   (next) =>
diff --git a/app/javascript/flavours/glitch/store/middlewares/sounds.ts b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
index ced4d910bf..d4ab1b612a 100644
--- a/app/javascript/flavours/glitch/store/middlewares/sounds.ts
+++ b/app/javascript/flavours/glitch/store/middlewares/sounds.ts
@@ -51,7 +51,7 @@ const play = (audio: HTMLAudioElement) => {
 };
 
 export const soundsMiddleware = (): Middleware<
-  // eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
+  // eslint-disable-next-line @typescript-eslint/no-empty-object-type -- we need to use `{}` here to ensure the dispatch types can be merged
   {},
   RootState
 > => {
diff --git a/app/javascript/flavours/glitch/utils/content_warning.js b/app/javascript/flavours/glitch/utils/content_warning.js
index 91d452baac..5390692f56 100644
--- a/app/javascript/flavours/glitch/utils/content_warning.js
+++ b/app/javascript/flavours/glitch/utils/content_warning.js
@@ -11,7 +11,7 @@ function _autoUnfoldCW(spoiler_text, skip_unfold_regex) {
 
   try {
     regex = new RegExp(skip_unfold_regex.trim(), 'i');
-  } catch (e) {
+  } catch {
     // Bad regex, skip filters
     return true;
   }

From 2d31cdbc288aa2fdcfc8cd640f247b57db295fed Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 10:16:07 +0200
Subject: [PATCH 45/89] [Glitch] Fix notifications re-rendering spuriously in
 web UI

Port f2a92c2d22345568ca7f47ee1d1d70de53eb547d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../components/notification_mention.tsx       |  4 ++-
 .../features/notifications_v2/index.tsx       |  3 ++-
 .../features/ui/containers/modal_container.js |  4 ++-
 .../ui/containers/notifications_container.js  | 19 +++-----------
 .../flavours/glitch/selectors/index.js        | 25 ++++++++++++++-----
 5 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
index 7c7d949374..276e2d3cc1 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
 
+import { isEqual } from 'lodash';
+
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
 import { me } from 'flavours/glitch/initial_state';
@@ -47,7 +49,7 @@ export const NotificationMention: React.FC<{
       status.get('visibility') === 'direct',
       status.get('in_reply_to_account_id') === me,
     ] as const;
-  });
+  }, isEqual);
 
   let labelRenderer = mentionLabelRenderer;
 
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
index f5bf7adda3..b51d2cc1fd 100644
--- a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -4,6 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { Helmet } from 'react-helmet';
 
+import { isEqual } from 'lodash';
 import { useDebouncedCallback } from 'use-debounce';
 
 import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
@@ -62,7 +63,7 @@ export const Notifications: React.FC<{
   multiColumn?: boolean;
 }> = ({ columnId, multiColumn }) => {
   const intl = useIntl();
-  const notifications = useAppSelector(selectNotificationGroups);
+  const notifications = useAppSelector(selectNotificationGroups, isEqual);
   const dispatch = useAppDispatch();
   const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
   const hasMore = notifications.at(-1)?.type === 'gap';
diff --git a/app/javascript/flavours/glitch/features/ui/containers/modal_container.js b/app/javascript/flavours/glitch/features/ui/containers/modal_container.js
index 1c3872cd50..63c568f847 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/modal_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/modal_container.js
@@ -3,10 +3,12 @@ import { connect } from 'react-redux';
 import { openModal, closeModal } from '../../../actions/modal';
 import ModalRoot from '../components/modal_root';
 
+const defaultProps = {};
+
 const mapStateToProps = state => ({
   ignoreFocus: state.getIn(['modal', 'ignoreFocus']),
   type: state.getIn(['modal', 'stack', 0, 'modalType'], null),
-  props: state.getIn(['modal', 'stack', 0, 'modalProps'], {}),
+  props: state.getIn(['modal', 'stack', 0, 'modalProps'], defaultProps),
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js b/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
index 3d60cfdad1..af494ff655 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/notifications_container.js
@@ -4,24 +4,11 @@ import { connect } from 'react-redux';
 
 import { NotificationStack } from 'react-notification';
 
-import { dismissAlert } from '../../../actions/alerts';
-import { getAlerts } from '../../../selectors';
-
-const formatIfNeeded = (intl, message, values) => {
-  if (typeof message === 'object') {
-    return intl.formatMessage(message, values);
-  }
-
-  return message;
-};
+import { dismissAlert } from 'flavours/glitch/actions/alerts';
+import { getAlerts } from 'flavours/glitch/selectors';
 
 const mapStateToProps = (state, { intl }) => ({
-  notifications: getAlerts(state).map(alert => ({
-    ...alert,
-    action: formatIfNeeded(intl, alert.action, alert.values),
-    title: formatIfNeeded(intl, alert.title, alert.values),
-    message: formatIfNeeded(intl, alert.message, alert.values),
-  })),
+  notifications: getAlerts(state, { intl }),
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js
index b3bf22fcab..1b2d63ae36 100644
--- a/app/javascript/flavours/glitch/selectors/index.js
+++ b/app/javascript/flavours/glitch/selectors/index.js
@@ -7,14 +7,16 @@ import { me } from '../initial_state';
 
 export { makeGetAccount } from "./accounts";
 
-const getFilters = (state, { contextType }) => {
-  if (!contextType) return null;
+const getFilters = createSelector([state => state.get('filters'), (_, { contextType }) => contextType], (filters, contextType) => {
+  if (!contextType) {
+    return null;
+  }
 
-  const serverSideType = toServerSideType(contextType);
   const now = new Date();
+  const serverSideType = toServerSideType(contextType);
 
-  return state.get('filters').filter((filter) => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
-};
+  return filters.filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
+});
 
 export const makeGetStatus = () => {
   return createSelector(
@@ -74,10 +76,21 @@ const ALERT_DEFAULTS = {
   style: false,
 };
 
-export const getAlerts = createSelector(state => state.get('alerts'), alerts =>
+const formatIfNeeded = (intl, message, values) => {
+  if (typeof message === 'object') {
+    return intl.formatMessage(message, values);
+  }
+
+  return message;
+};
+
+export const getAlerts = createSelector([state => state.get('alerts'), (_, { intl }) => intl], (alerts, intl) =>
   alerts.map(item => ({
     ...ALERT_DEFAULTS,
     ...item,
+    action: formatIfNeeded(intl, item.action, item.values),
+    title: formatIfNeeded(intl, item.title, item.values),
+    message: formatIfNeeded(intl, item.message, item.values),
   })).toArray());
 
 export const makeGetNotification = () => createSelector([

From e705ec13db1281d2078487c273ce447b58e81093 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 11:41:19 +0200
Subject: [PATCH 46/89] [Glitch] Change embedded posts to use web UI

Port 3d46f478174403a64bd194e8c60e11b07bbd5d2d to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/statuses.js       |   6 +-
 .../flavours/glitch/components/logo.tsx       |   7 +
 .../glitch/components/more_from_author.jsx    |   6 +-
 .../flavours/glitch/entrypoints/embed.tsx     |  74 ++++
 .../flavours/glitch/entrypoints/public.tsx    |  37 --
 .../features/standalone/status/index.tsx      |  94 ++++
 .../status/components/detailed_status.jsx     | 336 --------------
 .../status/components/detailed_status.tsx     | 413 ++++++++++++++++++
 .../containers/detailed_status_container.js   | 134 ------
 .../flavours/glitch/features/status/index.jsx |   2 +-
 .../flavours/glitch/hooks/useRenderSignal.ts  |  32 ++
 .../flavours/glitch/styles/application.scss   |   1 -
 .../flavours/glitch/styles/components.scss    |  35 +-
 .../flavours/glitch/styles/statuses.scss      | 239 ----------
 14 files changed, 650 insertions(+), 766 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/entrypoints/embed.tsx
 create mode 100644 app/javascript/flavours/glitch/features/standalone/status/index.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
 create mode 100644 app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
 create mode 100644 app/javascript/flavours/glitch/hooks/useRenderSignal.ts
 delete mode 100644 app/javascript/flavours/glitch/styles/statuses.scss

diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 2d83ae9926..2b6b589b37 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -49,11 +49,13 @@ export function fetchStatusRequest(id, skipLoading) {
   };
 }
 
-export function fetchStatus(id, forceFetch = false) {
+export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) {
   return (dispatch, getState) => {
     const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null;
 
-    dispatch(fetchContext(id));
+    if (alsoFetchContext) {
+      dispatch(fetchContext(id));
+    }
 
     if (skipLoading) {
       return;
diff --git a/app/javascript/flavours/glitch/components/logo.tsx b/app/javascript/flavours/glitch/components/logo.tsx
index b7f8bd6695..fe9680d0e3 100644
--- a/app/javascript/flavours/glitch/components/logo.tsx
+++ b/app/javascript/flavours/glitch/components/logo.tsx
@@ -7,6 +7,13 @@ export const WordmarkLogo: React.FC = () => (
   </svg>
 );
 
+export const IconLogo: React.FC = () => (
+  <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
+    <title>Mastodon</title>
+    <use xlinkHref='#logo-symbol-icon' />
+  </svg>
+);
+
 export const SymbolLogo: React.FC = () => (
   <img src={logo} alt='Mastodon' className='logo logo--icon' />
 );
diff --git a/app/javascript/flavours/glitch/components/more_from_author.jsx b/app/javascript/flavours/glitch/components/more_from_author.jsx
index 4f20ae76bf..f2377b450b 100644
--- a/app/javascript/flavours/glitch/components/more_from_author.jsx
+++ b/app/javascript/flavours/glitch/components/more_from_author.jsx
@@ -2,14 +2,12 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from 'react-intl';
 
+import { IconLogo } from 'flavours/glitch/components/logo';
 import { AuthorLink } from 'flavours/glitch/features/explore/components/author_link';
 
 export const MoreFromAuthor = ({ accountId }) => (
   <div className='more-from-author'>
-    <svg viewBox='0 0 79 79' className='logo logo--icon' role='img'>
-      <use xlinkHref='#logo-symbol-icon' />
-    </svg>
-
+    <IconLogo />
     <FormattedMessage id='link_preview.more_from_author' defaultMessage='More from {name}' values={{ name: <AuthorLink accountId={accountId} /> }} />
   </div>
 );
diff --git a/app/javascript/flavours/glitch/entrypoints/embed.tsx b/app/javascript/flavours/glitch/entrypoints/embed.tsx
new file mode 100644
index 0000000000..12eb4a413f
--- /dev/null
+++ b/app/javascript/flavours/glitch/entrypoints/embed.tsx
@@ -0,0 +1,74 @@
+import { createRoot } from 'react-dom/client';
+
+import '@/entrypoints/public-path';
+
+import { start } from 'flavours/glitch/common';
+import { Status } from 'flavours/glitch/features/standalone/status';
+import { afterInitialRender } from 'flavours/glitch/hooks/useRenderSignal';
+import { loadPolyfills } from 'flavours/glitch/polyfills';
+import ready from 'flavours/glitch/ready';
+
+start();
+
+function loaded() {
+  const mountNode = document.getElementById('mastodon-status');
+
+  if (mountNode) {
+    const attr = mountNode.getAttribute('data-props');
+
+    if (!attr) return;
+
+    const props = JSON.parse(attr) as { id: string; locale: string };
+    const root = createRoot(mountNode);
+
+    root.render(<Status {...props} />);
+  }
+}
+
+function main() {
+  ready(loaded).catch((error: unknown) => {
+    console.error(error);
+  });
+}
+
+loadPolyfills()
+  .then(main)
+  .catch((error: unknown) => {
+    console.error(error);
+  });
+
+interface SetHeightMessage {
+  type: 'setHeight';
+  id: string;
+  height: number;
+}
+
+function isSetHeightMessage(data: unknown): data is SetHeightMessage {
+  if (
+    data &&
+    typeof data === 'object' &&
+    'type' in data &&
+    data.type === 'setHeight'
+  )
+    return true;
+  else return false;
+}
+
+window.addEventListener('message', (e) => {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
+  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
+
+  const data = e.data;
+
+  // We use a timeout to allow for the React page to render before calculating the height
+  afterInitialRender(() => {
+    window.parent.postMessage(
+      {
+        type: 'setHeight',
+        id: data.id,
+        height: document.getElementsByTagName('html')[0]?.scrollHeight,
+      },
+      '*',
+    );
+  });
+});
diff --git a/app/javascript/flavours/glitch/entrypoints/public.tsx b/app/javascript/flavours/glitch/entrypoints/public.tsx
index 44afc9d825..41c0e34396 100644
--- a/app/javascript/flavours/glitch/entrypoints/public.tsx
+++ b/app/javascript/flavours/glitch/entrypoints/public.tsx
@@ -37,43 +37,6 @@ const messages = defineMessages({
   },
 });
 
-interface SetHeightMessage {
-  type: 'setHeight';
-  id: string;
-  height: number;
-}
-
-function isSetHeightMessage(data: unknown): data is SetHeightMessage {
-  if (
-    data &&
-    typeof data === 'object' &&
-    'type' in data &&
-    data.type === 'setHeight'
-  )
-    return true;
-  else return false;
-}
-
-window.addEventListener('message', (e) => {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- typings are not correct, it can be null in very rare cases
-  if (!e.data || !isSetHeightMessage(e.data) || !window.parent) return;
-
-  const data = e.data;
-
-  ready(() => {
-    window.parent.postMessage(
-      {
-        type: 'setHeight',
-        id: data.id,
-        height: document.getElementsByTagName('html')[0]?.scrollHeight,
-      },
-      '*',
-    );
-  }).catch((e: unknown) => {
-    console.error('Error in setHeightMessage postMessage', e);
-  });
-});
-
 function loaded() {
   const { messages: localeData } = getLocale();
 
diff --git a/app/javascript/flavours/glitch/features/standalone/status/index.tsx b/app/javascript/flavours/glitch/features/standalone/status/index.tsx
new file mode 100644
index 0000000000..280b8fbb09
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/standalone/status/index.tsx
@@ -0,0 +1,94 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return,
+                  @typescript-eslint/no-explicit-any,
+                  @typescript-eslint/no-unsafe-assignment */
+
+import { useEffect, useCallback } from 'react';
+
+import { Provider } from 'react-redux';
+
+import {
+  fetchStatus,
+  toggleStatusSpoilers,
+} from 'flavours/glitch/actions/statuses';
+import { hydrateStore } from 'flavours/glitch/actions/store';
+import { Router } from 'flavours/glitch/components/router';
+import { DetailedStatus } from 'flavours/glitch/features/status/components/detailed_status';
+import { useRenderSignal } from 'flavours/glitch/hooks/useRenderSignal';
+import initialState from 'flavours/glitch/initial_state';
+import { IntlProvider } from 'flavours/glitch/locales';
+import {
+  makeGetStatus,
+  makeGetPictureInPicture,
+} from 'flavours/glitch/selectors';
+import { store, useAppSelector, useAppDispatch } from 'flavours/glitch/store';
+
+const getStatus = makeGetStatus() as unknown as (arg0: any, arg1: any) => any;
+const getPictureInPicture = makeGetPictureInPicture() as unknown as (
+  arg0: any,
+  arg1: any,
+) => any;
+
+const Embed: React.FC<{ id: string }> = ({ id }) => {
+  const status = useAppSelector((state) => getStatus(state, { id }));
+  const pictureInPicture = useAppSelector((state) =>
+    getPictureInPicture(state, { id }),
+  );
+  const domain = useAppSelector((state) => state.meta.get('domain'));
+  const dispatch = useAppDispatch();
+  const dispatchRenderSignal = useRenderSignal();
+
+  useEffect(() => {
+    dispatch(fetchStatus(id, false, false));
+  }, [dispatch, id]);
+
+  const handleToggleHidden = useCallback(() => {
+    dispatch(toggleStatusSpoilers(id));
+  }, [dispatch, id]);
+
+  // This allows us to calculate the correct page height for embeds
+  if (status) {
+    dispatchRenderSignal();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const permalink = status?.get('url') as string;
+
+  return (
+    <div className='embed'>
+      <DetailedStatus
+        status={status}
+        domain={domain}
+        pictureInPicture={pictureInPicture}
+        onToggleHidden={handleToggleHidden}
+        expanded={false}
+        withLogo
+      />
+
+      <a
+        className='embed__overlay'
+        href={permalink}
+        target='_blank'
+        rel='noreferrer noopener'
+        aria-label=''
+      />
+    </div>
+  );
+};
+
+export const Status: React.FC<{ id: string }> = ({ id }) => {
+  useEffect(() => {
+    if (initialState) {
+      store.dispatch(hydrateStore(initialState));
+    }
+  }, []);
+
+  return (
+    <IntlProvider>
+      <Provider store={store}>
+        <Router>
+          <Embed id={id} />
+        </Router>
+      </Provider>
+    </IntlProvider>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
deleted file mode 100644
index 2db9fa6d3a..0000000000
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ /dev/null
@@ -1,336 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedDate, FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { AnimatedNumber } from 'flavours/glitch/components/animated_number';
-import AttachmentList from 'flavours/glitch/components/attachment_list';
-import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
-import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
-import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
-import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
-import PollContainer from 'flavours/glitch/containers/poll_container';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import MediaGallery from '../../../components/media_gallery';
-import StatusContent from '../../../components/status_content';
-import Audio from '../../audio';
-import scheduleIdleTask from '../../ui/util/schedule_idle_task';
-import Video from '../../video';
-
-import Card from './card';
-
-class DetailedStatus extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    settings: ImmutablePropTypes.map.isRequired,
-    onOpenMedia: PropTypes.func.isRequired,
-    onOpenVideo: PropTypes.func.isRequired,
-    onToggleHidden: PropTypes.func,
-    onTranslate: PropTypes.func.isRequired,
-    expanded: PropTypes.bool,
-    measureHeight: PropTypes.bool,
-    onHeightChange: PropTypes.func,
-    domain: PropTypes.string.isRequired,
-    compact: PropTypes.bool,
-    showMedia: PropTypes.bool,
-    pictureInPicture: ImmutablePropTypes.contains({
-      inUse: PropTypes.bool,
-      available: PropTypes.bool,
-    }),
-    onToggleMediaVisibility: PropTypes.func,
-    ...WithRouterPropTypes,
-  };
-
-  state = {
-    height: null,
-  };
-
-  handleAccountClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey) && this.props.history) {
-      e.preventDefault();
-      this.props.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
-    }
-
-    e.stopPropagation();
-  };
-
-  parseClick = (e, destination) => {
-    if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey) && this.props.history) {
-      e.preventDefault();
-      this.props.history.push(destination);
-    }
-
-    e.stopPropagation();
-  };
-
-  handleOpenVideo = (options) => {
-    this.props.onOpenVideo(this.props.status.getIn(['media_attachments', 0]), options);
-  };
-
-  _measureHeight (heightJustChanged) {
-    if (this.props.measureHeight && this.node) {
-      scheduleIdleTask(() => this.node && this.setState({ height: Math.ceil(this.node.scrollHeight) + 1 }));
-
-      if (this.props.onHeightChange && heightJustChanged) {
-        this.props.onHeightChange();
-      }
-    }
-  }
-
-  setRef = c => {
-    this.node = c;
-    this._measureHeight();
-  };
-
-  componentDidUpdate (prevProps, prevState) {
-    this._measureHeight(prevState.height !== this.state.height);
-  }
-
-  handleChildUpdate = () => {
-    this._measureHeight();
-  };
-
-  handleModalLink = e => {
-    e.preventDefault();
-
-    let href;
-
-    if (e.target.nodeName !== 'A') {
-      href = e.target.parentNode.href;
-    } else {
-      href = e.target.href;
-    }
-
-    window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
-  };
-
-  handleTranslate = () => {
-    const { onTranslate, status } = this.props;
-    onTranslate(status);
-  };
-
-  render () {
-    const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
-    const outerStyle = { boxSizing: 'border-box' };
-    const { compact, pictureInPicture, expanded, onToggleHidden, settings } = this.props;
-
-    if (!status) {
-      return null;
-    }
-
-    let applicationLink = '';
-    let reblogLink = '';
-    let favouriteLink = '';
-
-    //  Depending on user settings, some media are considered as parts of the
-    //  contents (affected by CW) while other will be displayed outside of the
-    //  CW.
-    let contentMedia = [];
-    let contentMediaIcons = [];
-    let extraMedia = [];
-    let extraMediaIcons = [];
-    let media = contentMedia;
-    let mediaIcons = contentMediaIcons;
-
-    if (settings.getIn(['content_warnings', 'media_outside'])) {
-      media = extraMedia;
-      mediaIcons = extraMediaIcons;
-    }
-
-    if (this.props.measureHeight) {
-      outerStyle.height = `${this.state.height}px`;
-    }
-
-    const language = status.getIn(['translation', 'language']) || status.get('language');
-
-    if (pictureInPicture.get('inUse')) {
-      media.push(<PictureInPicturePlaceholder />);
-      mediaIcons.push('video-camera');
-    } else if (status.get('media_attachments').size > 0) {
-      if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
-        media.push(<AttachmentList media={status.get('media_attachments')} />);
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
-        const attachment = status.getIn(['media_attachments', 0]);
-        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
-
-        media.push(
-          <Audio
-            src={attachment.get('url')}
-            alt={description}
-            lang={language}
-            duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
-            poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
-            backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
-            foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
-            accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
-            sensitive={status.get('sensitive')}
-            visible={this.props.showMedia}
-            blurhash={attachment.get('blurhash')}
-            height={150}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />,
-        );
-        mediaIcons.push('music');
-      } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        const attachment = status.getIn(['media_attachments', 0]);
-        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
-
-        media.push(
-          <Video
-            preview={attachment.get('preview_url')}
-            frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
-            blurhash={attachment.get('blurhash')}
-            src={attachment.get('url')}
-            alt={description}
-            lang={language}
-            inline
-            sensitive={status.get('sensitive')}
-            letterbox={settings.getIn(['media', 'letterbox'])}
-            fullwidth={settings.getIn(['media', 'fullwidth'])}
-            preventPlayback={!expanded}
-            onOpenVideo={this.handleOpenVideo}
-            autoplay
-            visible={this.props.showMedia}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />,
-        );
-        mediaIcons.push('video-camera');
-      } else {
-        media.push(
-          <MediaGallery
-            standalone
-            sensitive={status.get('sensitive')}
-            media={status.get('media_attachments')}
-            lang={language}
-            letterbox={settings.getIn(['media', 'letterbox'])}
-            fullwidth={settings.getIn(['media', 'fullwidth'])}
-            hidden={!expanded}
-            onOpenMedia={this.props.onOpenMedia}
-            visible={this.props.showMedia}
-            onToggleVisibility={this.props.onToggleMediaVisibility}
-          />,
-        );
-        mediaIcons.push('picture-o');
-      }
-    } else if (status.get('card')) {
-      media.push(<Card sensitive={status.get('sensitive')} onOpenMedia={this.props.onOpenMedia} card={status.get('card')} />);
-      mediaIcons.push('link');
-    }
-
-    if (status.get('poll')) {
-      contentMedia.push(<PollContainer pollId={status.get('poll')} lang={status.get('language')} />);
-      contentMediaIcons.push('tasks');
-    }
-
-    if (status.get('application')) {
-      applicationLink = <>·<a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></>;
-    }
-
-    const visibilityLink = <>·<VisibilityIcon visibility={status.get('visibility')} /></>;
-
-    if (!['unlisted', 'public'].includes(status.get('visibility'))) {
-      reblogLink = null;
-    } else if (this.props.history) {
-      reblogLink = (
-        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
-          <span className='detailed-status__reblogs'>
-            <AnimatedNumber value={status.get('reblogs_count')} />
-          </span>
-          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
-        </Link>
-      );
-    } else {
-      reblogLink = (
-        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <span className='detailed-status__reblogs'>
-            <AnimatedNumber value={status.get('reblogs_count')} />
-          </span>
-          <FormattedMessage id='status.reblogs' defaultMessage='{count, plural, one {boost} other {boosts}}' values={{ count: status.get('reblogs_count') }} />
-        </a>
-      );
-    }
-
-    if (this.props.history) {
-      favouriteLink = (
-        <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`} className='detailed-status__link'>
-          <span className='detailed-status__favorites'>
-            <AnimatedNumber value={status.get('favourites_count')} />
-          </span>
-          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
-        </Link>
-      );
-    } else {
-      favouriteLink = (
-        <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
-          <span className='detailed-status__favorites'>
-            <AnimatedNumber value={status.get('favourites_count')} />
-          </span>
-          <FormattedMessage id='status.favourites' defaultMessage='{count, plural, one {favorite} other {favorites}}' values={{ count: status.get('favourites_count') }} />
-        </a>
-      );
-    }
-
-    const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    contentMedia.push(hashtagBar);
-
-    return (
-      <div style={outerStyle}>
-        <div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })} data-status-by={status.getIn(['account', 'acct'])}>
-          <a href={status.getIn(['account', 'url'])} data-hover-card-account={status.getIn(['account', 'id'])} onClick={this.handleAccountClick} className='detailed-status__display-name'>
-            <div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={48} /></div>
-            <DisplayName account={status.get('account')} localDomain={this.props.domain} />
-          </a>
-
-          <StatusContent
-            status={status}
-            media={contentMedia}
-            extraMedia={extraMedia}
-            mediaIcons={contentMediaIcons}
-            expanded={expanded}
-            collapsed={false}
-            onExpandedToggle={onToggleHidden}
-            onTranslate={this.handleTranslate}
-            parseClick={this.parseClick}
-            onUpdate={this.handleChildUpdate}
-            tagLinks={settings.get('tag_misleading_links')}
-            rewriteMentions={settings.get('rewrite_mentions')}
-            disabled
-            {...statusContentProps}
-          />
-
-          <div className='detailed-status__meta'>
-            <div className='detailed-status__meta__line'>
-              <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener noreferrer'>
-                <FormattedDate value={new Date(status.get('created_at'))} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-              </a>
-
-              {visibilityLink}
-
-              {applicationLink}
-            </div>
-
-            {status.get('edited_at') && <div className='detailed-status__meta__line'><EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} /></div>}
-
-            <div className='detailed-status__meta__line'>
-              {reblogLink}
-              {reblogLink && <>·</>}
-              {favouriteLink}
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default withRouter(DetailedStatus);
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
new file mode 100644
index 0000000000..a1da973b49
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
@@ -0,0 +1,413 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access,
+                  @typescript-eslint/no-unsafe-call,
+                  @typescript-eslint/no-explicit-any,
+                  @typescript-eslint/no-unsafe-assignment */
+
+import type { CSSProperties } from 'react';
+import { useState, useRef, useCallback } from 'react';
+
+import { FormattedDate, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import { AnimatedNumber } from 'flavours/glitch/components/animated_number';
+import AttachmentList from 'flavours/glitch/components/attachment_list';
+import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
+import type { StatusLike } from 'flavours/glitch/components/hashtag_bar';
+import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
+import { IconLogo } from 'flavours/glitch/components/logo';
+import { Permalink } from 'flavours/glitch/components/permalink';
+import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
+import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import MediaGallery from '../../../components/media_gallery';
+import StatusContent from '../../../components/status_content';
+import Audio from '../../audio';
+import scheduleIdleTask from '../../ui/util/schedule_idle_task';
+import Video from '../../video';
+
+import Card from './card';
+
+interface VideoModalOptions {
+  startTime: number;
+  autoPlay?: boolean;
+  defaultVolume: number;
+  componentIndex: number;
+}
+
+export const DetailedStatus: React.FC<{
+  status: any;
+  onOpenMedia?: (status: any, index: number, lang: string) => void;
+  onOpenVideo?: (status: any, lang: string, options: VideoModalOptions) => void;
+  onTranslate?: (status: any) => void;
+  measureHeight?: boolean;
+  onHeightChange?: () => void;
+  domain: string;
+  showMedia?: boolean;
+  withLogo?: boolean;
+  pictureInPicture: any;
+  onToggleHidden?: (status: any) => void;
+  onToggleMediaVisibility?: () => void;
+  expanded: boolean;
+}> = ({
+  status,
+  onOpenMedia,
+  onOpenVideo,
+  onTranslate,
+  measureHeight,
+  onHeightChange,
+  domain,
+  showMedia,
+  withLogo,
+  pictureInPicture,
+  onToggleMediaVisibility,
+  onToggleHidden,
+  expanded,
+}) => {
+  const properStatus = status?.get('reblog') ?? status;
+  const [height, setHeight] = useState(0);
+  const nodeRef = useRef<HTMLDivElement>();
+
+  const rewriteMentions = useAppSelector(
+    (state) => state.local_settings.get('rewrite_mentions', false) as boolean,
+  );
+  const tagMisleadingLinks = useAppSelector(
+    (state) =>
+      state.local_settings.get('tag_misleading_links', false) as boolean,
+  );
+  const mediaOutsideCW = useAppSelector(
+    (state) =>
+      state.local_settings.getIn(
+        ['content_warnings', 'media_outside'],
+        false,
+      ) as boolean,
+  );
+  const letterboxMedia = useAppSelector(
+    (state) =>
+      state.local_settings.getIn(['media', 'letterbox'], false) as boolean,
+  );
+  const fullwidthMedia = useAppSelector(
+    (state) =>
+      state.local_settings.getIn(['media', 'fullwidth'], false) as boolean,
+  );
+
+  const handleOpenVideo = useCallback(
+    (options: VideoModalOptions) => {
+      const lang = (status.getIn(['translation', 'language']) ||
+        status.get('language')) as string;
+      if (onOpenVideo)
+        onOpenVideo(status.getIn(['media_attachments', 0]), lang, options);
+    },
+    [onOpenVideo, status],
+  );
+
+  const _measureHeight = useCallback(
+    (heightJustChanged?: boolean) => {
+      if (measureHeight && nodeRef.current) {
+        scheduleIdleTask(() => {
+          if (nodeRef.current)
+            setHeight(Math.ceil(nodeRef.current.scrollHeight) + 1);
+        });
+
+        if (onHeightChange && heightJustChanged) {
+          onHeightChange();
+        }
+      }
+    },
+    [onHeightChange, measureHeight, setHeight],
+  );
+
+  const handleRef = useCallback(
+    (c: HTMLDivElement) => {
+      nodeRef.current = c;
+      _measureHeight();
+    },
+    [_measureHeight],
+  );
+
+  const handleChildUpdate = useCallback(() => {
+    _measureHeight();
+  }, [_measureHeight]);
+
+  const handleTranslate = useCallback(() => {
+    if (onTranslate) onTranslate(status);
+  }, [onTranslate, status]);
+
+  if (!properStatus) {
+    return null;
+  }
+
+  let applicationLink;
+  let reblogLink;
+
+  //  Depending on user settings, some media are considered as parts of the
+  //  contents (affected by CW) while other will be displayed outside of the
+  //  CW.
+  const contentMedia: React.ReactNode[] = [];
+  const contentMediaIcons: string[] = [];
+  const extraMedia: React.ReactNode[] = [];
+  const extraMediaIcons: string[] = [];
+  let media = contentMedia;
+  let mediaIcons: string[] = contentMediaIcons;
+
+  if (mediaOutsideCW) {
+    media = extraMedia;
+    mediaIcons = extraMediaIcons;
+  }
+
+  const outerStyle = { boxSizing: 'border-box' } as CSSProperties;
+
+  if (measureHeight) {
+    outerStyle.height = height;
+  }
+
+  const language =
+    status.getIn(['translation', 'language']) || status.get('language');
+
+  if (pictureInPicture.get('inUse')) {
+    media.push(<PictureInPicturePlaceholder />);
+    mediaIcons.push('video-camera');
+  } else if (status.get('media_attachments').size > 0) {
+    if (
+      status
+        .get('media_attachments')
+        .some(
+          (item: Immutable.Map<string, any>) => item.get('type') === 'unknown',
+        )
+    ) {
+      media.push(<AttachmentList media={status.get('media_attachments')} />);
+    } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
+      const attachment = status.getIn(['media_attachments', 0]);
+      const description =
+        attachment.getIn(['translation', 'description']) ||
+        attachment.get('description');
+
+      media.push(
+        <Audio
+          src={attachment.get('url')}
+          alt={description}
+          lang={language}
+          duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
+          poster={
+            attachment.get('preview_url') ||
+            status.getIn(['account', 'avatar_static'])
+          }
+          backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
+          foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
+          accentColor={attachment.getIn(['meta', 'colors', 'accent'])}
+          sensitive={status.get('sensitive')}
+          visible={showMedia}
+          blurhash={attachment.get('blurhash')}
+          height={150}
+          onToggleVisibility={onToggleMediaVisibility}
+        />,
+      );
+      mediaIcons.push('music');
+    } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+      const attachment = status.getIn(['media_attachments', 0]);
+      const description =
+        attachment.getIn(['translation', 'description']) ||
+        attachment.get('description');
+
+      media.push(
+        <Video
+          preview={attachment.get('preview_url')}
+          frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
+          aspectRatio={`${attachment.getIn(['meta', 'original', 'width'])} / ${attachment.getIn(['meta', 'original', 'height'])}`}
+          blurhash={attachment.get('blurhash')}
+          src={attachment.get('url')}
+          alt={description}
+          lang={language}
+          width={300}
+          height={150}
+          onOpenVideo={handleOpenVideo}
+          sensitive={status.get('sensitive')}
+          visible={showMedia}
+          onToggleVisibility={onToggleMediaVisibility}
+          letterbox={letterboxMedia}
+          fullwidth={fullwidthMedia}
+          preventPlayback={!expanded}
+        />,
+      );
+      mediaIcons.push('video-camera');
+    } else {
+      media.push(
+        <MediaGallery
+          standalone
+          sensitive={status.get('sensitive')}
+          media={status.get('media_attachments')}
+          lang={language}
+          height={300}
+          letterbox={letterboxMedia}
+          fullwidth={fullwidthMedia}
+          hidden={!expanded}
+          onOpenMedia={onOpenMedia}
+          visible={showMedia}
+          onToggleVisibility={onToggleMediaVisibility}
+        />,
+      );
+      mediaIcons.push('picture-o');
+    }
+  } else if (status.get('spoiler_text').length === 0) {
+    media.push(
+      <Card
+        sensitive={status.get('sensitive')}
+        onOpenMedia={onOpenMedia}
+        card={status.get('card', null)}
+      />,
+    );
+    mediaIcons.push('link');
+  }
+
+  if (status.get('application')) {
+    applicationLink = (
+      <>
+        ·
+        <a
+          className='detailed-status__application'
+          href={status.getIn(['application', 'website'])}
+          target='_blank'
+          rel='noopener noreferrer'
+        >
+          {status.getIn(['application', 'name'])}
+        </a>
+      </>
+    );
+  }
+
+  const visibilityLink = (
+    <>
+      ·<VisibilityIcon visibility={status.get('visibility')} />
+    </>
+  );
+
+  if (['private', 'direct'].includes(status.get('visibility') as string)) {
+    reblogLink = '';
+  } else {
+    reblogLink = (
+      <Link
+        to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`}
+        className='detailed-status__link'
+      >
+        <span className='detailed-status__reblogs'>
+          <AnimatedNumber value={status.get('reblogs_count')} />
+        </span>
+        <FormattedMessage
+          id='status.reblogs'
+          defaultMessage='{count, plural, one {boost} other {boosts}}'
+          values={{ count: status.get('reblogs_count') }}
+        />
+      </Link>
+    );
+  }
+
+  const favouriteLink = (
+    <Link
+      to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
+      className='detailed-status__link'
+    >
+      <span className='detailed-status__favorites'>
+        <AnimatedNumber value={status.get('favourites_count')} />
+      </span>
+      <FormattedMessage
+        id='status.favourites'
+        defaultMessage='{count, plural, one {favorite} other {favorites}}'
+        values={{ count: status.get('favourites_count') }}
+      />
+    </Link>
+  );
+
+  const { statusContentProps, hashtagBar } = getHashtagBarForStatus(
+    status as StatusLike,
+  );
+  contentMedia.push(hashtagBar);
+
+  return (
+    <div style={outerStyle}>
+      <div
+        ref={handleRef}
+        className={classNames(
+          'detailed-status',
+          `detailed-status-${status.get('visibility')}`,
+        )}
+        data-status-by={status.getIn(['account', 'acct'])}
+      >
+        <Permalink
+          to={`/@${status.getIn(['account', 'acct'])}`}
+          href={status.getIn(['account', 'url'])}
+          data-hover-card-account={status.getIn(['account', 'id'])}
+          className='detailed-status__display-name'
+        >
+          <div className='detailed-status__display-avatar'>
+            <Avatar account={status.get('account')} size={46} />
+          </div>
+          <DisplayName account={status.get('account')} localDomain={domain} />
+          {withLogo && (
+            <>
+              <div className='spacer' />
+              <IconLogo />
+            </>
+          )}
+        </Permalink>
+
+        {/* TODO: parseClick={this.parseClick} */}
+        <StatusContent
+          status={status}
+          media={contentMedia}
+          extraMedia={extraMedia}
+          mediaIcons={contentMediaIcons}
+          expanded={expanded}
+          collapsed={false}
+          onExpandedToggle={onToggleHidden}
+          onTranslate={handleTranslate}
+          onUpdate={handleChildUpdate}
+          tagLinks={tagMisleadingLinks}
+          rewriteMentions={rewriteMentions}
+          {...(statusContentProps as any)}
+        />
+
+        <div className='detailed-status__meta'>
+          <div className='detailed-status__meta__line'>
+            <a
+              className='detailed-status__datetime'
+              href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`}
+              target='_blank'
+              rel='noopener noreferrer'
+            >
+              <FormattedDate
+                value={new Date(status.get('created_at') as string)}
+                year='numeric'
+                month='short'
+                day='2-digit'
+                hour='2-digit'
+                minute='2-digit'
+              />
+            </a>
+
+            {visibilityLink}
+            {applicationLink}
+          </div>
+
+          {status.get('edited_at') && (
+            <div className='detailed-status__meta__line'>
+              <EditedTimestamp
+                statusId={status.get('id')}
+                timestamp={status.get('edited_at')}
+              />
+            </div>
+          )}
+
+          <div className='detailed-status__meta__line'>
+            {reblogLink}
+            {reblogLink && <>·</>}
+            {favouriteLink}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js b/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
deleted file mode 100644
index 34bde2fc6e..0000000000
--- a/app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { injectIntl } from 'react-intl';
-
-import { connect } from 'react-redux';
-
-import { showAlertForError } from '../../../actions/alerts';
-import { initBlockModal } from '../../../actions/blocks';
-import {
-  replyCompose,
-  mentionCompose,
-  directCompose,
-} from '../../../actions/compose';
-import {
-  toggleReblog,
-  toggleFavourite,
-  pin,
-  unpin,
-} from '../../../actions/interactions';
-import { openModal } from '../../../actions/modal';
-import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from '../../../actions/reports';
-import {
-  muteStatus,
-  unmuteStatus,
-  deleteStatus,
-} from '../../../actions/statuses';
-import { deleteModal } from '../../../initial_state';
-import { makeGetStatus } from '../../../selectors';
-import DetailedStatus from '../components/detailed_status';
-
-const makeMapStateToProps = () => {
-  const getStatus = makeGetStatus();
-
-  const mapStateToProps = (state, props) => ({
-    status: getStatus(state, props),
-    domain: state.getIn(['meta', 'domain']),
-    settings: state.get('local_settings'),
-  });
-
-  return mapStateToProps;
-};
-
-const mapDispatchToProps = (dispatch) => ({
-
-  onReply (status) {
-    dispatch((_, getState) => {
-      let state = getState();
-      if (state.getIn(['compose', 'text']).trim().length !== 0) {
-        dispatch(openModal({ modalType: 'CONFIRM_REPLY', modalProps: { status } }));
-      } else {
-        dispatch(replyCompose(status));
-      }
-    });
-  },
-
-  onReblog (status, e) {
-    dispatch(toggleReblog(status.get('id'), e.shiftKey));
-  },
-
-  onFavourite (status, e) {
-    dispatch(toggleFavourite(status.get('id'), e.shiftKey));
-  },
-
-  onPin (status) {
-    if (status.get('pinned')) {
-      dispatch(unpin(status));
-    } else {
-      dispatch(pin(status));
-    }
-  },
-
-  onEmbed (status) {
-    dispatch(openModal({
-      modalType: 'EMBED',
-      modalProps: {
-        id: status.get('id'),
-        onError: error => dispatch(showAlertForError(error)),
-      },
-    }));
-  },
-
-  onDelete (status, withRedraft = false) {
-    if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), withRedraft));
-    } else {
-      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
-    }
-  },
-
-  onDirect (account) {
-    dispatch(directCompose(account));
-  },
-
-  onMention (account) {
-    dispatch(mentionCompose(account));
-  },
-
-  onOpenMedia (media, index, lang) {
-    dispatch(openModal({
-      modalType: 'MEDIA',
-      modalProps: { media, index, lang },
-    }));
-  },
-
-  onOpenVideo (media, lang, options) {
-    dispatch(openModal({
-      modalType: 'VIDEO',
-      modalProps: { media, lang, options },
-    }));
-  },
-
-  onBlock (status) {
-    const account = status.get('account');
-    dispatch(initBlockModal(account));
-  },
-
-  onReport (status) {
-    dispatch(initReport(status.get('account'), status));
-  },
-
-  onMute (account) {
-    dispatch(initMuteModal(account));
-  },
-
-  onMuteConversation (status) {
-    if (status.get('muted')) {
-      dispatch(unmuteStatus(status.get('id')));
-    } else {
-      dispatch(muteStatus(status.get('id')));
-    }
-  },
-
-});
-
-export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index 279d90b998..521db781b0 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -63,7 +63,7 @@ import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
 
 import ActionBar from './components/action_bar';
-import DetailedStatus from './components/detailed_status';
+import { DetailedStatus } from './components/detailed_status';
 
 
 const messages = defineMessages({
diff --git a/app/javascript/flavours/glitch/hooks/useRenderSignal.ts b/app/javascript/flavours/glitch/hooks/useRenderSignal.ts
new file mode 100644
index 0000000000..740df4a35a
--- /dev/null
+++ b/app/javascript/flavours/glitch/hooks/useRenderSignal.ts
@@ -0,0 +1,32 @@
+// This hook allows a component to signal that it's done rendering in a way that
+// can be used by e.g. our embed code to determine correct iframe height
+
+let renderSignalReceived = false;
+
+type Callback = () => void;
+
+let onInitialRender: Callback;
+
+export const afterInitialRender = (callback: Callback) => {
+  if (renderSignalReceived) {
+    callback();
+  } else {
+    onInitialRender = callback;
+  }
+};
+
+export const useRenderSignal = () => {
+  return () => {
+    if (renderSignalReceived) {
+      return;
+    }
+
+    renderSignalReceived = true;
+
+    if (typeof onInitialRender !== 'undefined') {
+      window.requestAnimationFrame(() => {
+        onInitialRender();
+      });
+    }
+  };
+};
diff --git a/app/javascript/flavours/glitch/styles/application.scss b/app/javascript/flavours/glitch/styles/application.scss
index 6a0ed80b30..fd55960311 100644
--- a/app/javascript/flavours/glitch/styles/application.scss
+++ b/app/javascript/flavours/glitch/styles/application.scss
@@ -11,7 +11,6 @@
 @import 'widgets';
 @import 'forms';
 @import 'accounts';
-@import 'statuses';
 @import 'components';
 @import 'polls';
 @import 'modal';
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index c773b991ef..7c9a6ac480 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1849,18 +1849,6 @@ body > [data-popper-placement] {
   padding: 14px 10px; // glitch: reduced padding
   border-top: 1px solid var(--background-border-color);
 
-  &--flex {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-items: flex-start;
-
-    .status__content,
-    .detailed-status__meta {
-      flex: 100%;
-    }
-  }
-
   .status__content {
     font-size: 19px;
     line-height: 24px;
@@ -1887,6 +1875,29 @@ body > [data-popper-placement] {
     padding: 0;
     margin-bottom: 16px;
   }
+
+  .logo {
+    width: 40px;
+    height: 40px;
+    color: $dark-text-color;
+  }
+}
+
+.embed {
+  position: relative;
+
+  &__overlay {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+
+  .detailed-status {
+    border-top: 0;
+  }
 }
 
 .scrollable > div:first-child .detailed-status {
diff --git a/app/javascript/flavours/glitch/styles/statuses.scss b/app/javascript/flavours/glitch/styles/statuses.scss
deleted file mode 100644
index cc509a6821..0000000000
--- a/app/javascript/flavours/glitch/styles/statuses.scss
+++ /dev/null
@@ -1,239 +0,0 @@
-.activity-stream {
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  border-radius: 4px;
-  overflow: hidden;
-  margin-bottom: 10px;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    margin-bottom: 0;
-    border-radius: 0;
-    box-shadow: none;
-  }
-
-  &--headless {
-    border-radius: 0;
-    margin: 0;
-    box-shadow: none;
-
-    .detailed-status,
-    .status {
-      border-radius: 0 !important;
-    }
-  }
-
-  div[data-component] {
-    width: 100%;
-  }
-
-  .entry {
-    background: $ui-base-color;
-
-    .detailed-status,
-    .status,
-    .load-more {
-      animation: none;
-    }
-
-    &:last-child {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-bottom: 0;
-        border-radius: 0 0 4px 4px;
-      }
-    }
-
-    &:first-child {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-radius: 4px 4px 0 0;
-      }
-
-      &:last-child {
-        .detailed-status,
-        .status,
-        .load-more {
-          border-radius: 4px;
-        }
-      }
-    }
-
-    @media screen and (width <= 740px) {
-      .detailed-status,
-      .status,
-      .load-more {
-        border-radius: 0 !important;
-      }
-    }
-  }
-
-  &--highlighted .entry {
-    background: lighten($ui-base-color, 8%);
-  }
-}
-
-.button.logo-button svg {
-  width: 20px;
-  height: auto;
-  vertical-align: middle;
-  margin-inline-end: 5px;
-  fill: $primary-text-color;
-
-  @media screen and (max-width: $no-gap-breakpoint) {
-    display: none;
-  }
-}
-
-.embed {
-  .status__content[data-spoiler='folded'] {
-    .e-content {
-      display: none;
-    }
-
-    p:first-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .detailed-status {
-    padding: 15px;
-
-    .detailed-status__display-avatar .account__avatar {
-      width: 48px;
-      height: 48px;
-    }
-  }
-
-  .status {
-    padding: 15px;
-    padding-inline-start: (48px + 15px * 2);
-    min-height: 48px + 2px;
-
-    &__avatar {
-      inset-inline-start: 15px;
-      top: 17px;
-
-      .account__avatar {
-        width: 48px;
-        height: 48px;
-      }
-    }
-
-    &__content {
-      padding-top: 5px;
-    }
-
-    &__prepend {
-      padding: 8px 0;
-      padding-bottom: 2px;
-      margin: initial;
-      margin-inline-start: 48px + 15px * 2;
-      padding-top: 15px;
-    }
-
-    &__prepend-icon-wrapper {
-      position: absolute;
-      margin: initial;
-      float: initial;
-      width: auto;
-      inset-inline-start: -32px;
-    }
-
-    .media-gallery,
-    &__action-bar,
-    .video-player {
-      margin-top: 10px;
-    }
-
-    &__action-bar-button {
-      font-size: 18px;
-      width: 23.1429px;
-      height: 23.1429px;
-      line-height: 23.15px;
-    }
-  }
-}
-
-// Styling from upstream's WebUI, as public pages use the same layout
-.embed {
-  .status {
-    .status__info {
-      font-size: 15px;
-      display: initial;
-    }
-
-    .status__relative-time {
-      color: $dark-text-color;
-      float: right;
-      font-size: 14px;
-      width: auto;
-      margin: initial;
-      padding: initial;
-      padding-bottom: 1px;
-    }
-
-    .status__visibility-icon {
-      padding: 0 4px;
-
-      .icon {
-        width: 1em;
-        height: 1em;
-        margin-bottom: -2px;
-      }
-    }
-
-    .status__info .status__display-name {
-      display: block;
-      max-width: 100%;
-      padding: 6px 0;
-      padding-right: 25px;
-      margin: initial;
-    }
-
-    .status__avatar {
-      height: 48px;
-      position: absolute;
-      width: 48px;
-      margin: initial;
-    }
-  }
-}
-
-.rtl {
-  .embed {
-    .status {
-      padding-left: 10px;
-      padding-right: 68px;
-
-      .status__info .status__display-name {
-        padding-left: 25px;
-        padding-right: 0;
-      }
-
-      .status__relative-time,
-      .status__visibility-icon {
-        float: left;
-      }
-    }
-  }
-}
-
-.status__content__read-more-button,
-.status__content__translate-button {
-  display: flex;
-  align-items: center;
-  font-size: 15px;
-  line-height: 20px;
-  color: $highlight-text-color;
-  border: 0;
-  background: transparent;
-  padding: 0;
-  padding-top: 16px;
-  text-decoration: none;
-
-  &:hover,
-  &:active {
-    text-decoration: underline;
-  }
-}

From bd68d2ab21bfcc434812d7a208f8474716388a50 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Sep 2024 14:54:16 +0200
Subject: [PATCH 47/89] [Glitch] Change design of embed modal in web UI

Port 24ef8255b3f9b44cb54f49bc78fe3382a7070b1a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/components/copy_paste_text.tsx     |  90 ++++++++++++++
 .../glitch/components/status_action_bar.jsx   |   2 +-
 .../glitch/containers/status_container.js     |   7 +-
 .../glitch/features/onboarding/share.jsx      |  63 +---------
 .../features/status/components/action_bar.jsx |   2 +-
 .../features/ui/components/embed_modal.jsx    | 101 ---------------
 .../features/ui/components/embed_modal.tsx    | 116 ++++++++++++++++++
 .../flavours/glitch/styles/components.scss    | 107 +++++++---------
 8 files changed, 254 insertions(+), 234 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/components/copy_paste_text.tsx
 delete mode 100644 app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
 create mode 100644 app/javascript/flavours/glitch/features/ui/components/embed_modal.tsx

diff --git a/app/javascript/flavours/glitch/components/copy_paste_text.tsx b/app/javascript/flavours/glitch/components/copy_paste_text.tsx
new file mode 100644
index 0000000000..053654b6e0
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/copy_paste_text.tsx
@@ -0,0 +1,90 @@
+import { useRef, useState, useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { useTimeout } from 'flavours/glitch/hooks/useTimeout';
+
+export const CopyPasteText: React.FC<{ value: string }> = ({ value }) => {
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  const [copied, setCopied] = useState(false);
+  const [focused, setFocused] = useState(false);
+  const [setAnimationTimeout] = useTimeout();
+
+  const handleInputClick = useCallback(() => {
+    setCopied(false);
+
+    if (inputRef.current) {
+      inputRef.current.focus();
+      inputRef.current.select();
+      inputRef.current.setSelectionRange(0, value.length);
+    }
+  }, [setCopied, value]);
+
+  const handleButtonClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      void navigator.clipboard.writeText(value);
+      inputRef.current?.blur();
+      setCopied(true);
+      setAnimationTimeout(() => {
+        setCopied(false);
+      }, 700);
+    },
+    [setCopied, setAnimationTimeout, value],
+  );
+
+  const handleKeyUp = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (e.key !== ' ') return;
+      void navigator.clipboard.writeText(value);
+      setCopied(true);
+      setAnimationTimeout(() => {
+        setCopied(false);
+      }, 700);
+    },
+    [setCopied, setAnimationTimeout, value],
+  );
+
+  const handleFocus = useCallback(() => {
+    setFocused(true);
+  }, [setFocused]);
+
+  const handleBlur = useCallback(() => {
+    setFocused(false);
+  }, [setFocused]);
+
+  return (
+    <div
+      className={classNames('copy-paste-text', { copied, focused })}
+      tabIndex={0}
+      role='button'
+      onClick={handleInputClick}
+      onKeyUp={handleKeyUp}
+    >
+      <textarea
+        readOnly
+        value={value}
+        ref={inputRef}
+        onClick={handleInputClick}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
+      />
+
+      <button className='button' onClick={handleButtonClick}>
+        <Icon id='copy' icon={ContentCopyIcon} />{' '}
+        {copied ? (
+          <FormattedMessage id='copypaste.copied' defaultMessage='Copied' />
+        ) : (
+          <FormattedMessage
+            id='copypaste.copy_to_clipboard'
+            defaultMessage='Copy to clipboard'
+          />
+        )}
+      </button>
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index 7b00f84f1b..01b4411192 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -56,7 +56,7 @@ const messages = defineMessages({
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  embed: { id: 'status.embed', defaultMessage: 'Get embed code' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js
index 116a3455f7..493a01da23 100644
--- a/app/javascript/flavours/glitch/containers/status_container.js
+++ b/app/javascript/flavours/glitch/containers/status_container.js
@@ -34,8 +34,6 @@ import Status from 'flavours/glitch/components/status';
 import { deleteModal } from 'flavours/glitch/initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
 
-import { showAlertForError } from '../actions/alerts';
-
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
@@ -111,10 +109,7 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
   onEmbed (status) {
     dispatch(openModal({
       modalType: 'EMBED',
-      modalProps: {
-        id: status.get('id'),
-        onError: error => dispatch(showAlertForError(error)),
-      },
+      modalProps: { id: status.get('id') },
     }));
   },
 
diff --git a/app/javascript/flavours/glitch/features/onboarding/share.jsx b/app/javascript/flavours/glitch/features/onboarding/share.jsx
index 0c7d579c10..c985c798aa 100644
--- a/app/javascript/flavours/glitch/features/onboarding/share.jsx
+++ b/app/javascript/flavours/glitch/features/onboarding/share.jsx
@@ -10,8 +10,8 @@ import { Link } from 'react-router-dom';
 import SwipeableViews from 'react-swipeable-views';
 
 import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
-import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
 import { ColumnBackButton } from 'flavours/glitch/components/column_back_button';
+import { CopyPasteText } from 'flavours/glitch/components/copy_paste_text';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { me, domain } from 'flavours/glitch/initial_state';
 import { useAppSelector } from 'flavours/glitch/store';
@@ -20,67 +20,6 @@ const messages = defineMessages({
   shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },
 });
 
-class CopyPasteText extends PureComponent {
-
-  static propTypes = {
-    value: PropTypes.string,
-  };
-
-  state = {
-    copied: false,
-    focused: false,
-  };
-
-  setRef = c => {
-    this.input = c;
-  };
-
-  handleInputClick = () => {
-    this.setState({ copied: false });
-    this.input.focus();
-    this.input.select();
-    this.input.setSelectionRange(0, this.props.value.length);
-  };
-
-  handleButtonClick = e => {
-    e.stopPropagation();
-
-    const { value } = this.props;
-    navigator.clipboard.writeText(value);
-    this.input.blur();
-    this.setState({ copied: true });
-    this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
-  };
-
-  handleFocus = () => {
-    this.setState({ focused: true });
-  };
-
-  handleBlur = () => {
-    this.setState({ focused: false });
-  };
-
-  componentWillUnmount () {
-    if (this.timeout) clearTimeout(this.timeout);
-  }
-
-  render () {
-    const { value } = this.props;
-    const { copied, focused } = this.state;
-
-    return (
-      <div className={classNames('copy-paste-text', { copied, focused })} tabIndex='0' role='button' onClick={this.handleInputClick}>
-        <textarea readOnly value={value} ref={this.setRef} onClick={this.handleInputClick} onFocus={this.handleFocus} onBlur={this.handleBlur} />
-
-        <button className='button' onClick={this.handleButtonClick}>
-          <Icon id='copy' icon={ContentCopyIcon} /> {copied ? <FormattedMessage id='copypaste.copied' defaultMessage='Copied' /> : <FormattedMessage id='copypaste.copy_to_clipboard' defaultMessage='Copy to clipboard' />}
-        </button>
-      </div>
-    );
-  }
-
-}
-
 class TipCarousel extends PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index 3377019bdc..bf676973bc 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -49,7 +49,7 @@ const messages = defineMessages({
   share: { id: 'status.share', defaultMessage: 'Share' },
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  embed: { id: 'status.embed', defaultMessage: 'Get embed code' },
   admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
   admin_status: { id: 'status.admin_status', defaultMessage: 'Open this post in the moderation interface' },
   admin_domain: { id: 'status.admin_domain', defaultMessage: 'Open moderation interface for {domain}' },
diff --git a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
deleted file mode 100644
index 87316b7f23..0000000000
--- a/app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import api from 'flavours/glitch/api';
-import { IconButton } from 'flavours/glitch/components/icon_button';
-
-const messages = defineMessages({
-  close: { id: 'lightbox.close', defaultMessage: 'Close' },
-});
-
-class EmbedModal extends ImmutablePureComponent {
-
-  static propTypes = {
-    id: PropTypes.string.isRequired,
-    onClose: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-  };
-
-  state = {
-    loading: false,
-    oembed: null,
-  };
-
-  componentDidMount () {
-    const { id } = this.props;
-
-    this.setState({ loading: true });
-
-    api().get(`/api/web/embeds/${id}`).then(res => {
-      this.setState({ loading: false, oembed: res.data });
-
-      const iframeDocument = this.iframe.contentWindow.document;
-
-      iframeDocument.open();
-      iframeDocument.write(res.data.html);
-      iframeDocument.close();
-
-      iframeDocument.body.style.margin = 0;
-      this.iframe.width  = iframeDocument.body.scrollWidth;
-      this.iframe.height = iframeDocument.body.scrollHeight;
-    }).catch(error => {
-      this.props.onError(error);
-    });
-  }
-
-  setIframeRef = c =>  {
-    this.iframe = c;
-  };
-
-  handleTextareaClick = (e) => {
-    e.target.select();
-  };
-
-  render () {
-    const { intl, onClose } = this.props;
-    const { oembed } = this.state;
-
-    return (
-      <div className='modal-root__modal report-modal embed-modal'>
-        <div className='report-modal__target'>
-          <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' iconComponent={CloseIcon} onClick={onClose} size={16} />
-          <FormattedMessage id='status.embed' defaultMessage='Embed' />
-        </div>
-
-        <div className='report-modal__container embed-modal__container' style={{ display: 'block' }}>
-          <p className='hint'>
-            <FormattedMessage id='embed.instructions' defaultMessage='Embed this status on your website by copying the code below.' />
-          </p>
-
-          <input
-            type='text'
-            className='embed-modal__html'
-            readOnly
-            value={oembed && oembed.html || ''}
-            onClick={this.handleTextareaClick}
-          />
-
-          <p className='hint'>
-            <FormattedMessage id='embed.preview' defaultMessage='Here is what it will look like:' />
-          </p>
-
-          <iframe
-            className='embed-modal__iframe'
-            frameBorder='0'
-            ref={this.setIframeRef}
-            sandbox='allow-scripts allow-same-origin'
-            title='preview'
-          />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-export default injectIntl(EmbedModal);
diff --git a/app/javascript/flavours/glitch/features/ui/components/embed_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/embed_modal.tsx
new file mode 100644
index 0000000000..989aec3d63
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/ui/components/embed_modal.tsx
@@ -0,0 +1,116 @@
+import { useRef, useState, useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { showAlertForError } from 'flavours/glitch/actions/alerts';
+import api from 'flavours/glitch/api';
+import { Button } from 'flavours/glitch/components/button';
+import { CopyPasteText } from 'flavours/glitch/components/copy_paste_text';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+interface OEmbedResponse {
+  html: string;
+}
+
+const EmbedModal: React.FC<{
+  id: string;
+  onClose: () => void;
+}> = ({ id, onClose }) => {
+  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const intervalRef = useRef<ReturnType<typeof setInterval>>();
+  const [oembed, setOembed] = useState<OEmbedResponse | null>(null);
+  const dispatch = useAppDispatch();
+
+  useEffect(() => {
+    api()
+      .get(`/api/web/embeds/${id}`)
+      .then((res) => {
+        const data = res.data as OEmbedResponse;
+
+        setOembed(data);
+
+        const iframeDocument = iframeRef.current?.contentWindow?.document;
+
+        if (!iframeDocument) {
+          return '';
+        }
+
+        iframeDocument.open();
+        iframeDocument.write(data.html);
+        iframeDocument.close();
+
+        iframeDocument.body.style.margin = '0px';
+
+        // This is our best chance to ensure the parent iframe has the correct height...
+        intervalRef.current = setInterval(
+          () =>
+            window.requestAnimationFrame(() => {
+              if (iframeRef.current) {
+                iframeRef.current.width = `${iframeDocument.body.scrollWidth}px`;
+                iframeRef.current.height = `${iframeDocument.body.scrollHeight}px`;
+              }
+            }),
+          100,
+        );
+
+        return '';
+      })
+      .catch((error: unknown) => {
+        dispatch(showAlertForError(error));
+      });
+  }, [dispatch, id, setOembed]);
+
+  useEffect(
+    () => () => {
+      if (intervalRef.current) {
+        clearInterval(intervalRef.current);
+      }
+    },
+    [],
+  );
+
+  return (
+    <div className='modal-root__modal dialog-modal'>
+      <div className='dialog-modal__header'>
+        <Button onClick={onClose}>
+          <FormattedMessage id='report.close' defaultMessage='Done' />
+        </Button>
+        <span className='dialog-modal__header__title'>
+          <FormattedMessage id='status.embed' defaultMessage='Get embed code' />
+        </span>
+        <Button secondary onClick={onClose}>
+          <FormattedMessage
+            id='confirmation_modal.cancel'
+            defaultMessage='Cancel'
+          />
+        </Button>
+      </div>
+
+      <div className='dialog-modal__content'>
+        <div className='dialog-modal__content__form'>
+          <FormattedMessage
+            id='embed.instructions'
+            defaultMessage='Embed this status on your website by copying the code below.'
+          />
+
+          <CopyPasteText value={oembed?.html ?? ''} />
+
+          <FormattedMessage
+            id='embed.preview'
+            defaultMessage='Here is what it will look like:'
+          />
+
+          <iframe
+            frameBorder='0'
+            ref={iframeRef}
+            sandbox='allow-scripts allow-same-origin'
+            title='Preview'
+          />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default EmbedModal;
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 7c9a6ac480..0c09adec9a 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6741,6 +6741,50 @@ a.status-card {
   }
 }
 
+.dialog-modal {
+  width: 588px;
+  max-height: 80vh;
+  flex-direction: column;
+  background: var(--modal-background-color);
+  backdrop-filter: var(--background-filter);
+  border: 1px solid var(--modal-border-color);
+  border-radius: 16px;
+
+  &__header {
+    border-bottom: 1px solid var(--modal-border-color);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-direction: row-reverse;
+    padding: 12px 24px;
+
+    &__title {
+      font-size: 16px;
+      line-height: 24px;
+      font-weight: 500;
+      letter-spacing: 0.15px;
+    }
+  }
+
+  &__content {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.25px;
+    overflow-y: auto;
+
+    &__form {
+      display: flex;
+      flex-direction: column;
+      gap: 16px;
+      padding: 24px;
+    }
+  }
+
+  .copy-paste-text {
+    margin-bottom: 0;
+  }
+}
+
 .hotkey-combination {
   display: inline-flex;
   align-items: center;
@@ -8273,69 +8317,6 @@ noscript {
   }
 }
 
-.embed-modal {
-  width: auto;
-  max-width: 80vw;
-  max-height: 80vh;
-
-  h4 {
-    padding: 30px;
-    font-weight: 500;
-    font-size: 16px;
-    text-align: center;
-  }
-
-  .embed-modal__container {
-    padding: 10px;
-
-    .hint {
-      margin-bottom: 15px;
-    }
-
-    .embed-modal__html {
-      outline: 0;
-      box-sizing: border-box;
-      display: block;
-      width: 100%;
-      border: 0;
-      padding: 10px;
-      font-family: $font-monospace, monospace;
-      background: $ui-base-color;
-      color: $primary-text-color;
-      font-size: 14px;
-      margin: 0;
-      margin-bottom: 15px;
-      border-radius: 4px;
-
-      &::-moz-focus-inner {
-        border: 0;
-      }
-
-      &::-moz-focus-inner,
-      &:focus,
-      &:active {
-        outline: 0 !important;
-      }
-
-      &:focus {
-        background: lighten($ui-base-color, 4%);
-      }
-
-      @media screen and (width <= 600px) {
-        font-size: 16px;
-      }
-    }
-
-    .embed-modal__iframe {
-      width: 400px;
-      max-width: 100%;
-      overflow: hidden;
-      border: 0;
-      border-radius: 4px;
-    }
-  }
-}
-
 .moved-account-banner,
 .follow-request-banner,
 .account-memorial-banner {

From afd3953cdd90d342359775b91126667be2ff6fbd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 15:15:05 +0200
Subject: [PATCH 48/89] [Glitch] Autofocus primary button in modals

Port 5f782f9629de25a2029fbc75d79316d583adc9a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/ui/components/block_modal.jsx   | 2 +-
 .../ui/components/confirmation_modals/confirmation_modal.tsx | 5 ++++-
 .../glitch/features/ui/components/domain_block_modal.jsx     | 2 +-
 .../flavours/glitch/features/ui/components/mute_modal.jsx    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
index fa772b067d..a5ee7bfa4f 100644
--- a/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/block_modal.jsx
@@ -99,7 +99,7 @@ export const BlockModal = ({ accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='confirmations.block.confirm' defaultMessage='Block' />
           </Button>
         </div>
diff --git a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
index 429850ef32..6b5b5ca3ca 100644
--- a/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -79,7 +79,10 @@ export const ConfirmationModal: React.FC<
             />
           </button>
 
-          <Button onClick={handleClick}>{confirm}</Button>
+          {/* eslint-disable-next-line jsx-a11y/no-autofocus -- we are in a modal and thus autofocusing is justified */}
+          <Button onClick={handleClick} autoFocus>
+            {confirm}
+          </Button>
         </div>
       </div>
     </div>
diff --git a/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
index b1ab81dab5..8b06389179 100644
--- a/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/domain_block_modal.jsx
@@ -88,7 +88,7 @@ export const DomainBlockModal = ({ domain, accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='domain_block_modal.block' defaultMessage='Block server' />
           </Button>
         </div>
diff --git a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
index f94adbd858..e208f12173 100644
--- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx
@@ -137,7 +137,7 @@ export const MuteModal = ({ accountId, acct }) => {
             <FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />
           </button>
 
-          <Button onClick={handleClick}>
+          <Button onClick={handleClick} autoFocus>
             <FormattedMessage id='confirmations.mute.confirm' defaultMessage='Mute' />
           </Button>
         </div>

From 9b1ecf7aee670b95077b0fde86ada3edf9c75f89 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 12 Sep 2024 09:18:43 -0500
Subject: [PATCH 49/89] [Glitch] Fix review history and action modal styling

Port a269ff9253050fb9a0b2c063c253eacfad77b738 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 19 +++++--------
 .../glitch/styles/mastodon-light/diff.scss    | 27 -------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0c09adec9a..4f922e5139 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6812,17 +6812,10 @@ a.status-card {
   position: relative;
   flex-direction: column;
 
-  .status__relative-time {
-    order: 2;
+  @media screen and (max-width: $no-columns-breakpoint) {
+    border-bottom: 0;
+    border-radius: 4px 4px 0 0;
   }
-
-  .status__content__spoiler-link {
-    color: lighten($secondary-text-color, 8%);
-  }
-}
-
-.boost-modal .status-direct {
-  background-color: inherit;
 }
 
 .boost-modal__container {
@@ -7221,7 +7214,7 @@ a.status-card {
 
     li:not(:empty) {
       a {
-        color: $inverted-text-color;
+        color: $primary-text-color;
         display: flex;
         padding: 12px 16px;
         font-size: 15px;
@@ -7314,7 +7307,7 @@ a.status-card {
 
 .compare-history-modal {
   .report-modal__target {
-    border-bottom: 1px solid $ui-secondary-color;
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   &__container {
@@ -7324,7 +7317,7 @@ a.status-card {
   }
 
   .status__content {
-    color: $inverted-text-color;
+    color: $secondary-text-color;
     font-size: 19px;
     line-height: 24px;
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 850a67dd2c..2e5cb59398 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -147,33 +147,6 @@
   border-top-color: lighten($ui-base-color, 4%);
 }
 
-// Change the background colors of modals
-.actions-modal,
-.boost-modal,
-.confirmation-modal,
-.mute-modal,
-.block-modal,
-.report-modal,
-.report-dialog-modal,
-.embed-modal,
-.error-modal,
-.onboarding-modal,
-.compare-history-modal,
-.report-modal__comment,
-.report-modal__comment,
-.announcements,
-.picture-in-picture__header,
-.picture-in-picture__footer,
-.reactions-bar__item {
-  background: $white;
-  border: 1px solid var(--background-border-color);
-}
-
-.setting-text__wrapper,
-.setting-text {
-  border: 1px solid var(--background-border-color);
-}
-
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {

From 202077517c298c918782b764c7073215856c70db Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 12 Sep 2024 16:09:55 -0400
Subject: [PATCH 50/89] Add "search" group for chewy classes in simplecov
 config (#31890)

---
 spec/rails_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0b24f68f73..ee03b49bc6 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -21,6 +21,7 @@ unless ENV['DISABLE_SIMPLECOV'] == 'true'
     add_group 'Libraries', 'lib'
     add_group 'Policies', 'app/policies'
     add_group 'Presenters', 'app/presenters'
+    add_group 'Search', 'app/chewy'
     add_group 'Serializers', 'app/serializers'
     add_group 'Services', 'app/services'
     add_group 'Validators', 'app/validators'

From 4050beb6e2eff82934297eeaebd095603ad2c942 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 22:30:40 +0200
Subject: [PATCH 51/89] Fix detailed status timestamp link target not being the
 original URL

---
 .../glitch/features/status/components/detailed_status.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
index a1da973b49..0c2a20a531 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
@@ -374,7 +374,7 @@ export const DetailedStatus: React.FC<{
           <div className='detailed-status__meta__line'>
             <a
               className='detailed-status__datetime'
-              href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`}
+              href={status.get('url')}
               target='_blank'
               rel='noopener noreferrer'
             >

From 427ed60274f2fb7a7a24fe52c04ed95c8f10bd8e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 12 Sep 2024 22:42:07 +0200
Subject: [PATCH 52/89] Fix link handling within detailed status contents

---
 .../status/components/detailed_status.tsx        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
index 0c2a20a531..a4e7fccf9a 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
@@ -19,6 +19,7 @@ import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
 import { IconLogo } from 'flavours/glitch/components/logo';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
+import { useAppHistory } from 'flavours/glitch/components/router';
 import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
 import { useAppSelector } from 'flavours/glitch/store';
 
@@ -71,6 +72,7 @@ export const DetailedStatus: React.FC<{
   const properStatus = status?.get('reblog') ?? status;
   const [height, setHeight] = useState(0);
   const nodeRef = useRef<HTMLDivElement>();
+  const history = useAppHistory();
 
   const rewriteMentions = useAppSelector(
     (state) => state.local_settings.get('rewrite_mentions', false) as boolean,
@@ -137,6 +139,18 @@ export const DetailedStatus: React.FC<{
     if (onTranslate) onTranslate(status);
   }, [onTranslate, status]);
 
+  const parseClick = useCallback(
+    (e: React.MouseEvent, destination: string) => {
+      if (e.button === 0 && !(e.ctrlKey || e.altKey || e.metaKey)) {
+        e.preventDefault();
+        history.push(destination);
+      }
+
+      e.stopPropagation();
+    },
+    [history],
+  );
+
   if (!properStatus) {
     return null;
   }
@@ -354,7 +368,6 @@ export const DetailedStatus: React.FC<{
           )}
         </Permalink>
 
-        {/* TODO: parseClick={this.parseClick} */}
         <StatusContent
           status={status}
           media={contentMedia}
@@ -367,6 +380,7 @@ export const DetailedStatus: React.FC<{
           onUpdate={handleChildUpdate}
           tagLinks={tagMisleadingLinks}
           rewriteMentions={rewriteMentions}
+          parseClick={parseClick}
           {...(statusContentProps as any)}
         />
 

From 353ade767b32f2237a46e0bbac53cb07ac3e91e2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 10:41:46 +0200
Subject: [PATCH 53/89] New Crowdin Translations (automated) (#31898)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/an.json      |  1 -
 app/javascript/mastodon/locales/ar.json      | 11 ++-
 app/javascript/mastodon/locales/ast.json     |  1 -
 app/javascript/mastodon/locales/be.json      |  1 -
 app/javascript/mastodon/locales/bg.json      |  1 -
 app/javascript/mastodon/locales/bn.json      |  1 -
 app/javascript/mastodon/locales/br.json      |  1 -
 app/javascript/mastodon/locales/ca.json      |  1 -
 app/javascript/mastodon/locales/ckb.json     |  1 -
 app/javascript/mastodon/locales/co.json      |  1 -
 app/javascript/mastodon/locales/cs.json      |  1 -
 app/javascript/mastodon/locales/cy.json      |  1 -
 app/javascript/mastodon/locales/da.json      |  2 +-
 app/javascript/mastodon/locales/de.json      |  4 +-
 app/javascript/mastodon/locales/el.json      |  1 -
 app/javascript/mastodon/locales/en-GB.json   |  1 -
 app/javascript/mastodon/locales/eo.json      |  1 -
 app/javascript/mastodon/locales/es-AR.json   |  1 -
 app/javascript/mastodon/locales/es-MX.json   |  4 +-
 app/javascript/mastodon/locales/es.json      |  4 +-
 app/javascript/mastodon/locales/et.json      |  1 -
 app/javascript/mastodon/locales/eu.json      |  1 -
 app/javascript/mastodon/locales/fa.json      |  9 ++-
 app/javascript/mastodon/locales/fi.json      |  2 +-
 app/javascript/mastodon/locales/fo.json      |  1 -
 app/javascript/mastodon/locales/fr-CA.json   |  3 +-
 app/javascript/mastodon/locales/fr.json      |  5 +-
 app/javascript/mastodon/locales/fy.json      |  1 -
 app/javascript/mastodon/locales/ga.json      |  1 -
 app/javascript/mastodon/locales/gd.json      |  1 -
 app/javascript/mastodon/locales/gl.json      |  6 +-
 app/javascript/mastodon/locales/he.json      |  1 -
 app/javascript/mastodon/locales/hr.json      |  1 -
 app/javascript/mastodon/locales/hu.json      |  2 +-
 app/javascript/mastodon/locales/hy.json      |  1 -
 app/javascript/mastodon/locales/ia.json      |  1 -
 app/javascript/mastodon/locales/id.json      |  1 -
 app/javascript/mastodon/locales/ie.json      |  1 -
 app/javascript/mastodon/locales/io.json      |  1 -
 app/javascript/mastodon/locales/is.json      |  1 -
 app/javascript/mastodon/locales/it.json      |  4 +-
 app/javascript/mastodon/locales/ja.json      |  1 -
 app/javascript/mastodon/locales/ka.json      |  1 -
 app/javascript/mastodon/locales/kab.json     |  1 -
 app/javascript/mastodon/locales/kk.json      |  1 -
 app/javascript/mastodon/locales/ko.json      |  1 -
 app/javascript/mastodon/locales/ku.json      |  1 -
 app/javascript/mastodon/locales/kw.json      |  1 -
 app/javascript/mastodon/locales/lad.json     |  1 -
 app/javascript/mastodon/locales/lt.json      |  1 -
 app/javascript/mastodon/locales/lv.json      | 12 ++-
 app/javascript/mastodon/locales/ml.json      |  1 -
 app/javascript/mastodon/locales/ms.json      |  1 -
 app/javascript/mastodon/locales/my.json      |  1 -
 app/javascript/mastodon/locales/nl.json      |  2 +-
 app/javascript/mastodon/locales/nn.json      |  2 +-
 app/javascript/mastodon/locales/no.json      |  1 -
 app/javascript/mastodon/locales/oc.json      |  1 -
 app/javascript/mastodon/locales/pa.json      |  1 -
 app/javascript/mastodon/locales/pl.json      |  2 +-
 app/javascript/mastodon/locales/pt-BR.json   |  2 +-
 app/javascript/mastodon/locales/pt-PT.json   |  6 +-
 app/javascript/mastodon/locales/ro.json      |  1 -
 app/javascript/mastodon/locales/ru.json      |  1 -
 app/javascript/mastodon/locales/sa.json      |  1 -
 app/javascript/mastodon/locales/sc.json      |  1 -
 app/javascript/mastodon/locales/sco.json     |  1 -
 app/javascript/mastodon/locales/si.json      |  1 -
 app/javascript/mastodon/locales/sk.json      |  1 -
 app/javascript/mastodon/locales/sl.json      |  1 -
 app/javascript/mastodon/locales/sq.json      |  2 +-
 app/javascript/mastodon/locales/sr-Latn.json |  1 -
 app/javascript/mastodon/locales/sr.json      |  1 -
 app/javascript/mastodon/locales/sv.json      |  2 +-
 app/javascript/mastodon/locales/ta.json      |  1 -
 app/javascript/mastodon/locales/te.json      |  1 -
 app/javascript/mastodon/locales/th.json      |  1 -
 app/javascript/mastodon/locales/tok.json     |  1 -
 app/javascript/mastodon/locales/tr.json      |  2 +-
 app/javascript/mastodon/locales/tt.json      |  1 -
 app/javascript/mastodon/locales/uk.json      |  2 +-
 app/javascript/mastodon/locales/vi.json      |  1 -
 app/javascript/mastodon/locales/zh-CN.json   |  2 +-
 app/javascript/mastodon/locales/zh-HK.json   |  1 -
 app/javascript/mastodon/locales/zh-TW.json   |  2 +-
 config/locales/activerecord.es-MX.yml        |  6 ++
 config/locales/activerecord.es.yml           |  6 ++
 config/locales/activerecord.fr-CA.yml        |  3 +
 config/locales/activerecord.fr.yml           |  3 +
 config/locales/activerecord.lv.yml           |  6 ++
 config/locales/ar.yml                        |  7 ++
 config/locales/doorkeeper.lv.yml             |  1 +
 config/locales/es-MX.yml                     | 11 +++
 config/locales/es.yml                        | 11 +++
 config/locales/fa.yml                        | 82 ++++++++++++++++++++
 config/locales/fi.yml                        |  2 +
 config/locales/fo.yml                        |  3 +
 config/locales/fr-CA.yml                     |  7 ++
 config/locales/fr.yml                        |  7 ++
 config/locales/lv.yml                        | 26 +++++++
 config/locales/simple_form.ar.yml            |  1 +
 config/locales/simple_form.es-MX.yml         |  3 +
 config/locales/simple_form.es.yml            |  3 +
 config/locales/simple_form.fi.yml            |  1 +
 config/locales/simple_form.fr-CA.yml         |  2 +
 config/locales/simple_form.fr.yml            |  2 +
 106 files changed, 256 insertions(+), 92 deletions(-)

diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 893882fe7a..fcd3080421 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -480,7 +480,6 @@
   "status.detailed_status": "Vista de conversación detallada",
   "status.edit": "Editar",
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
   "status.history.created": "{name} creyó {date}",
   "status.history.edited": "{name} editó {date}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 0dbeb0a190..dc89dc6e39 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -3,7 +3,7 @@
   "about.contact": "للاتصال:",
   "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.",
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
-  "about.domain_blocks.preamble": "يسمح لك ماستدون عموماً بعرض المحتوى من المستخدمين من أي خادم آخر في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادم بالذات.",
+  "about.domain_blocks.preamble": "يتيح مَستُدون عمومًا لمستخدميه مطالعة المحتوى من المستخدمين من الخواديم الأخرى في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم.",
   "about.domain_blocks.silenced.explanation": "لن تظهر لك ملفات التعريف الشخصية والمحتوى من هذا الخادوم، إلا إن بحثت عنه عمدًا أو تابعته.",
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "لن يتم معالجة أي بيانات من هذا الخادم أو تخزينها أو تبادلها، مما يجعل أي تفاعل أو اتصال مع المستخدمين من هذا الخادم مستحيلا.",
@@ -34,7 +34,7 @@
   "account.follow_back": "تابعه بالمثل",
   "account.followers": "مُتابِعون",
   "account.followers.empty": "لا أحدَ يُتابع هذا المُستخدم إلى حد الآن.",
-  "account.followers_counter": "{count, plural, zero {}one {{counter} متابع} two {{counter} متابعين} few {{counter} متابعين} many {{counter} متابعين} other {{counter} متابعين}}",
+  "account.followers_counter": "{count, plural, zero{لا مُتابع} one {مُتابعٌ واحِد} two {مُتابعانِ اِثنان} few {{counter} مُتابِعين} many {{counter} مُتابِعًا} other {{counter} مُتابع}}",
   "account.following": "الاشتراكات",
   "account.follows.empty": "لا يُتابع هذا المُستخدمُ أيَّ أحدٍ حتى الآن.",
   "account.go_to_profile": "اذهب إلى الملف الشخصي",
@@ -43,7 +43,7 @@
   "account.joined_short": "انضم في",
   "account.languages": "تغيير اللغات المشترَك فيها",
   "account.link_verified_on": "تمَّ التَّحقق مِن مِلْكيّة هذا الرابط بتاريخ {date}",
-  "account.locked_info": "تمَّ تعيين حالة خصوصية هذا الحساب إلى مُقفَل. يُراجع المالك يدويًا من يمكنه متابعته.",
+  "account.locked_info": "تم ضبط حالة خصوصية هذا الحساب على أنه مؤمّن. إذ يراجع صاحبه يدويًا من يُسمح له بالمتابعة.",
   "account.media": "وسائط",
   "account.mention": "أذكُر @{name}",
   "account.moved_to": "أشار {name} إلى أن حسابه الجديد الآن:",
@@ -443,6 +443,7 @@
   "lists.subheading": "قوائمك",
   "load_pending": "{count, plural, one {# عنصر جديد} other {# عناصر جديدة}}",
   "loading_indicator.label": "جاري التحميل…",
+  "media_gallery.hide": "إخفاء",
   "moved_to_account_banner.text": "حسابك {disabledAccount} معطل حاليًا لأنك انتقلت إلى {movedToAccount}.",
   "mute_modal.hide_from_notifications": "إخفاء من قائمة الإشعارات",
   "mute_modal.hide_options": "إخفاء الخيارات",
@@ -744,6 +745,7 @@
   "status.bookmark": "أضفه إلى الفواصل المرجعية",
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
+  "status.continued_thread": "تكملة للخيط",
   "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",
   "status.detailed_status": "تفاصيل المحادثة",
@@ -752,7 +754,7 @@
   "status.edit": "تعديل",
   "status.edited": "آخر تعديل يوم {date}",
   "status.edited_x_times": "عُدّل {count, plural, zero {} one {مرةً واحدة} two {مرّتان} few {{count} مرات} many {{count} مرة} other {{count} مرة}}",
-  "status.embed": "إدماج",
+  "status.embed": "الحصول على شفرة الإدماج",
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذا المنشور",
@@ -777,6 +779,7 @@
   "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة وإعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
+  "status.replied_in_thread": "رد في خيط",
   "status.replied_to": "رَدًا على {name}",
   "status.reply": "ردّ",
   "status.replyAll": "رُد على الخيط",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 507703023c..008dc6a663 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -419,7 +419,6 @@
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
-  "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 412eae1481..a0900b84e6 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -748,7 +748,6 @@
   "status.edit": "Рэдагаваць",
   "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
-  "status.embed": "Убудаваць",
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index b89b539dcf..2a435c2074 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -766,7 +766,6 @@
   "status.edit": "Редактиране",
   "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
-  "status.embed": "Вграждане",
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index df97abdff5..9512f6a92b 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -408,7 +408,6 @@
   "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
   "status.edit": "সম্পাদন",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দ",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 226ff756ff..18616fcef2 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -575,7 +575,6 @@
   "status.edit": "Kemmañ",
   "status.edited": "Kemmet da ziwezhañ d'an {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
   "status.history.created": "Krouet gant {name} {date}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 91f28bd151..d0ee437af9 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -789,7 +789,6 @@
   "status.edit": "Edita",
   "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
-  "status.embed": "Incrusta",
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 61b81c9f31..2a3a391eab 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -539,7 +539,6 @@
   "status.direct_indicator": "ئاماژەی تایبەت",
   "status.edit": "دەستکاری",
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
-  "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
   "status.history.created": "{name} دروستکراوە لە{date}",
   "status.history.edited": "{name} دروستکاریکراوە لە{date}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 180616b782..37eb945615 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -319,7 +319,6 @@
   "status.delete": "Toglie",
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Integrà",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 8dd8f31fa8..134e683fa1 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -729,7 +729,6 @@
   "status.edit": "Upravit",
   "status.edited": "Naposledy upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
-  "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 7f058d8912..a585592955 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -789,7 +789,6 @@
   "status.edit": "Golygu",
   "status.edited": "Golygwyd ddiwethaf {date}",
   "status.edited_x_times": "Golygwyd {count, plural, one {count} two {count} other {{count} gwaith}}",
-  "status.embed": "Mewnblannu",
   "status.favourite": "Ffafrio",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index dea313ffed..97d8215535 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -789,7 +789,7 @@
   "status.edit": "Redigér",
   "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
-  "status.embed": "Indlejr",
+  "status.embed": "Hent indlejringskode",
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 46bb08d7cb..03be448789 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -236,7 +236,7 @@
   "domain_pill.your_handle": "Deine Adresse:",
   "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
   "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
-  "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. auf deiner Website) einbetten, indem du diesen iFrame-Code einfügst.",
+  "embed.instructions": "Du kannst diesen Beitrag auf deiner Website einbetten, indem du den nachfolgenden Code kopierst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
   "emoji_button.clear": "Leeren",
@@ -789,7 +789,7 @@
   "status.edit": "Beitrag bearbeiten",
   "status.edited": "Zuletzt am {date} bearbeitet",
   "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
-  "status.embed": "Beitrag per iFrame einbetten",
+  "status.embed": "Code zum Einbetten",
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 64a603923e..d832fa1014 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -780,7 +780,6 @@
   "status.edit": "Επεξεργασία",
   "status.edited": "Τελευταία επεξεργασία {date}",
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
-  "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Αγαπημένα",
   "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c727b8e49f..a40353a739 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -789,7 +789,6 @@
   "status.edit": "Edit",
   "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
   "status.favourite": "Favourite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index d8ec27748e..ce7201dacf 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -628,7 +628,6 @@
   "status.direct_indicator": "Privata mencio",
   "status.edit": "Redakti",
   "status.edited_x_times": "Redactita {count, plural, one {{count} fojon} other {{count} fojojn}}",
-  "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
   "status.filter": "Filtri ĉi tiun afiŝon",
   "status.history.created": "{name} kreis {date}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index dfba0fe5d9..65eab7f437 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -789,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Insertar",
   "status.favourite": "Marcar como favorito",
   "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 63f3d53812..ae9658cd90 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
@@ -779,6 +780,7 @@
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Eliminar retoot",
   "status.cannot_reblog": "Este toot no puede retootearse",
+  "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
@@ -787,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
@@ -812,6 +813,7 @@
   "status.reblogs.empty": "Nadie retooteó este toot todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_in_thread": "Respondió en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index b01eb68222..61a958ed38 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Tus listas",
   "load_pending": "{count, plural, one {# nuevo elemento} other {# nuevos elementos}}",
   "loading_indicator.label": "Cargando…",
+  "media_gallery.hide": "Ocultar",
   "moved_to_account_banner.text": "Tu cuenta {disabledAccount} está actualmente deshabilitada porque te has mudado a {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar de las notificaciones",
   "mute_modal.hide_options": "Ocultar opciones",
@@ -779,6 +780,7 @@
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
   "status.cannot_reblog": "Esta publicación no se puede impulsar",
+  "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace a la publicación",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
@@ -787,7 +789,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
@@ -812,6 +813,7 @@
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
+  "status.replied_in_thread": "Respondió en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index ca37a152fe..93c2cefb47 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -787,7 +787,6 @@
   "status.edit": "Muuda",
   "status.edited": "Viimati muudetud {date}",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
-  "status.embed": "Manustamine",
   "status.favourite": "Lemmik",
   "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 15dd63486b..2248ffbf9d 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -783,7 +783,6 @@
   "status.edit": "Editatu",
   "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
-  "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
   "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index d2b520e1d2..4221859fea 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -447,6 +447,7 @@
   "lists.subheading": "سیاهه‌هایتان",
   "load_pending": "{count, plural, one {# مورد جدید} other {# مورد جدید}}",
   "loading_indicator.label": "در حال بارگذاری…",
+  "media_gallery.hide": "نهفتن",
   "moved_to_account_banner.text": "حسابتان {disabledAccount} اکنون از کار افتاده؛ چرا که به {movedToAccount} منتقل شدید.",
   "mute_modal.hide_from_notifications": "نهفتن از آگاهی‌ها",
   "mute_modal.hide_options": "گزینه‌های نهفتن",
@@ -487,9 +488,13 @@
   "notification.admin.report": "{name}، {target} را گزارش داد",
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
+  "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
   "notification.favourite": "{name} فرسته‌تان را برگزید",
+  "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
+  "notification.follow.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
+  "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
   "notification.label.mention": "اشاره",
   "notification.label.private_mention": "اشارهٔ خصوصی",
   "notification.label.private_reply": "پاسخ خصوصی",
@@ -507,6 +512,7 @@
   "notification.own_poll": "نظرسنجیتان پایان یافت",
   "notification.poll": "نظرسنجی‌ای که در آن رأی دادید به پایان رسید",
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
+  "notification.reblog.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را تقویت کردند",
   "notification.relationships_severance_event": "قطع ارتباط با {name}",
   "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
   "notification.status": "{name} چیزی فرستاد",
@@ -742,6 +748,7 @@
   "status.bookmark": "نشانک",
   "status.cancel_reblog_private": "ناتقویت",
   "status.cannot_reblog": "این فرسته قابل تقویت نیست",
+  "status.continued_thread": "رشتهٔ دنباله دار",
   "status.copy": "رونوشت از پیوند فرسته",
   "status.delete": "حذف",
   "status.detailed_status": "نمایش کامل گفتگو",
@@ -750,7 +757,6 @@
   "status.edit": "ویرایش",
   "status.edited": "آخرین ویرایش {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
-  "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
   "status.favourites": "{count, plural, one {برگزیده} other {برگزیده}}",
   "status.filter": "پالایش این فرسته",
@@ -775,6 +781,7 @@
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
   "status.redraft": "حذف و بازنویسی",
   "status.remove_bookmark": "برداشتن نشانک",
+  "status.replied_in_thread": "در رشته پاسخ داده",
   "status.replied_to": "به {name} پاسخ داد",
   "status.reply": "پاسخ",
   "status.replyAll": "پاسخ به رشته",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index d8c5b72040..e1a411e52e 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -789,7 +789,7 @@
   "status.edit": "Muokkaa",
   "status.edited": "Viimeksi muokattu {date}",
   "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
-  "status.embed": "Upota",
+  "status.embed": "Hanki upotuskoodi",
   "status.favourite": "Suosikki",
   "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 6e7eb3b7c2..73c64b1b82 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -789,7 +789,6 @@
   "status.edit": "Rætta",
   "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
-  "status.embed": "Legg inní",
   "status.favourite": "Dámdur postur",
   "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 9f51aaaa7d..96ae81c58a 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -456,6 +456,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
+  "media_gallery.hide": "Masquer",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
@@ -778,6 +779,7 @@
   "status.bookmark": "Ajouter aux signets",
   "status.cancel_reblog_private": "Débooster",
   "status.cannot_reblog": "Cette publication ne peut pas être boostée",
+  "status.continued_thread": "Suite du fil",
   "status.copy": "Copier un lien vers cette publication",
   "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
@@ -786,7 +788,6 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
-  "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5bcc1c946b..fb0bfac29d 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -456,6 +456,7 @@
   "lists.subheading": "Vos listes",
   "load_pending": "{count, plural, one {# nouvel élément} other {# nouveaux éléments}}",
   "loading_indicator.label": "Chargement…",
+  "media_gallery.hide": "Masquer",
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
@@ -778,6 +779,7 @@
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
   "status.cannot_reblog": "Ce message ne peut pas être partagé",
+  "status.continued_thread": "Suite du fil",
   "status.copy": "Copier le lien vers le message",
   "status.delete": "Supprimer",
   "status.detailed_status": "Vue détaillée de la conversation",
@@ -786,7 +788,6 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
-  "status.embed": "Intégrer",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
@@ -794,7 +795,7 @@
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
   "status.media.open": "Cliquez pour ouvrir",
-  "status.media.show": "Cliquez pour voir",
+  "status.media.show": "Cliquer pour afficher",
   "status.media_hidden": "Média caché",
   "status.mention": "Mentionner @{name}",
   "status.more": "Plus",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index badd6a1c21..0a51db36a4 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -787,7 +787,6 @@
   "status.edit": "Bewurkje",
   "status.edited": "Lêst bywurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
-  "status.embed": "Ynslute",
   "status.favourite": "Favoryt",
   "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
   "status.filter": "Dit berjocht filterje",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 95bb293854..794a433cd2 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -787,7 +787,6 @@
   "status.edit": "Cuir in eagar",
   "status.edited": "Arna chuir in eagar anuas {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
-  "status.embed": "Leabaigh",
   "status.favourite": "Is fearr leat",
   "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index e2f67bc296..3f1b353e75 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -787,7 +787,6 @@
   "status.edit": "Deasaich",
   "status.edited": "An deasachadh mu dheireadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
-  "status.embed": "Leabaich",
   "status.favourite": "Cuir ris na h-annsachdan",
   "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index b0b530e88f..1293d96bbd 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -236,8 +236,8 @@
   "domain_pill.your_handle": "O teu alcume:",
   "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
-  "embed.instructions": "Engade esta publicación ó teu sitio web copiando o seguinte código.",
-  "embed.preview": "Así será mostrado:",
+  "embed.instructions": "Inclúe esta publicación no teu sitio web copiando o seguinte código.",
+  "embed.preview": "Vaise ver así:",
   "emoji_button.activity": "Actividade",
   "emoji_button.clear": "Limpar",
   "emoji_button.custom": "Personalizado",
@@ -789,7 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
-  "status.embed": "Incrustar",
+  "status.embed": "O código a incluír",
   "status.favourite": "Favorecer",
   "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 80d9f054cc..532c11d17c 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -789,7 +789,6 @@
   "status.edit": "עריכה",
   "status.edited": "נערך לאחרונה {date}",
   "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
-  "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
   "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9f5782767b..26c527f2fe 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -457,7 +457,6 @@
   "status.delete": "Obriši",
   "status.edit": "Uredi",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
   "status.history.created": "Kreirao/la {name} prije {date}",
   "status.history.edited": "Uredio/la {name} prije {date}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1e4e02cb9d..587f58f248 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -789,7 +789,7 @@
   "status.edit": "Szerkesztés",
   "status.edited": "Utoljára szerkesztve {date}",
   "status.edited_x_times": "{count, plural, one {{count} alkalommal} other {{count} alkalommal}} szerkesztve",
-  "status.embed": "Beágyazás",
+  "status.embed": "Beágyazási kód lekérése",
   "status.favourite": "Kedvenc",
   "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index d1475338fd..a81abb82f0 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -448,7 +448,6 @@
   "status.direct_indicator": "Մասնաւոր յիշատակում",
   "status.edit": "Խմբագրել",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filter": "Զտել այս գրառումը",
   "status.history.created": "{name}-ը ստեղծել է՝ {date}",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 9d7e3ff2c7..e301363f27 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -759,7 +759,6 @@
   "status.edit": "Modificar",
   "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
-  "status.embed": "Incastrar",
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 3e2cc03145..687c32c1b1 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -583,7 +583,6 @@
   "status.detailed_status": "Tampilan detail percakapan",
   "status.edit": "Edit",
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
-  "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
   "status.history.created": "{name} membuat {date}",
   "status.history.edited": "{name} mengedit {date}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 7a176dfbb6..3226801019 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -698,7 +698,6 @@
   "status.edit": "Modificar",
   "status.edited": "Ultimmen actualisat ye {date}",
   "status.edited_x_times": "Modificat {count, plural, one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Inbedar",
   "status.favourite": "Favoritisar",
   "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index d0ccb923ba..bb0a86ac2b 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -589,7 +589,6 @@
   "status.direct_indicator": "Privata menciono",
   "status.edit": "Modifikez",
   "status.edited_x_times": "Modifikesis {count, plural, one {{count} foyo} other {{count} foyi}}",
-  "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
   "status.filter": "Filtragez ca posto",
   "status.history.created": "{name} kreis ye {date}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 83932f1b4b..ba362afc8a 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -789,7 +789,6 @@
   "status.edit": "Breyta",
   "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
-  "status.embed": "Ívefja",
   "status.favourite": "Eftirlæti",
   "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 1c8cff5490..daa135afea 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -780,6 +780,7 @@
   "status.bookmark": "Aggiungi segnalibro",
   "status.cancel_reblog_private": "Annulla reblog",
   "status.cannot_reblog": "Questo post non può essere condiviso",
+  "status.continued_thread": "Discussione continua",
   "status.copy": "Copia link al post",
   "status.delete": "Elimina",
   "status.detailed_status": "Vista conversazione dettagliata",
@@ -788,7 +789,7 @@
   "status.edit": "Modifica",
   "status.edited": "Ultima modifica {date}",
   "status.edited_x_times": "Modificato {count, plural, one {{count} volta} other {{count} volte}}",
-  "status.embed": "Incorpora",
+  "status.embed": "Ottieni codice incorporato",
   "status.favourite": "Preferito",
   "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
@@ -813,6 +814,7 @@
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",
+  "status.replied_in_thread": "Ha risposto nella discussione",
   "status.replied_to": "Risposta a {name}",
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 60dd8b12ea..7ea1694f1e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -787,7 +787,6 @@
   "status.edit": "編集",
   "status.edited": "最終更新日 {date}",
   "status.edited_x_times": "{count}回編集",
-  "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
   "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
   "status.filter": "この投稿をフィルターする",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 0bd86a2476..fc0ed0730d 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -222,7 +222,6 @@
   "status.copy": "Copy link to status",
   "status.delete": "წაშლა",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ჩართვა",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index ae783b6c24..5ccfbecf81 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -584,7 +584,6 @@
   "status.direct_indicator": "Abdar uslig",
   "status.edit": "Ẓreg",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
-  "status.embed": "Seddu",
   "status.favourite": "Amenyaf",
   "status.favourites": "{count, plural, one {n usmenyaf} other {n ismenyafen}}",
   "status.filter": "Sizdeg tassufeɣt-a",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index eace5d95b8..f146fc652d 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -315,7 +315,6 @@
   "status.delete": "Өшіру",
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Embеd",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4c78f4332e..751e5790e1 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -788,7 +788,6 @@
   "status.edit": "수정",
   "status.edited": "{date}에 마지막으로 편집됨",
   "status.edited_x_times": "{count, plural, other {{count}}} 번 수정됨",
-  "status.embed": "임베드",
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index d69f4b0d05..dd10000d18 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -498,7 +498,6 @@
   "status.direct_indicator": "Qalkirinê taybet",
   "status.edit": "Serrast bike",
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
-  "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
   "status.history.created": "{name} {date} afirand",
   "status.history.edited": "{name} {date} serrast kir",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 046910daf8..60b8321d53 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -317,7 +317,6 @@
   "status.delete": "Dilea",
   "status.detailed_status": "Gwel kesklapp a-vanyl",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Staga",
   "status.load_more": "Karga moy",
   "status.media_hidden": "Myski kudhys",
   "status.mention": "Meneges @{name}",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index e63c22ec69..f956abfb1e 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -707,7 +707,6 @@
   "status.edit": "Edita",
   "status.edited": "Ultima edisyon: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
   "status.history.created": "{name} kriyo {date}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index cc905e3a21..86e8d092b8 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -779,7 +779,6 @@
   "status.edit": "Redaguoti",
   "status.edited": "Paskutinį kartą redaguota {date}",
   "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
-  "status.embed": "Įterpti",
   "status.favourite": "Pamėgti",
   "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 37dc1d06db..77dc5c497c 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -11,6 +11,7 @@
   "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sociālo tīklu nodrošina {mastodon}",
   "about.rules": "Servera noteikumi",
+  "account.account_note_header": "Personīga piezīme",
   "account.add_or_remove_from_list": "Pievienot vai Noņemt no sarakstiem",
   "account.badges.bot": "Automatizēts",
   "account.badges.group": "Grupa",
@@ -91,6 +92,8 @@
   "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
   "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
+  "boost_modal.reblog": "Pastiprināt ierakstu?",
+  "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?",
   "bundle_column_error.copy_stacktrace": "Kopēt kļūdu ziņojumu",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
   "bundle_column_error.error.title": "Ak vai!",
@@ -163,21 +166,29 @@
   "confirmations.block.confirm": "Bloķēt",
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām vēlies dzēst šo ierakstu?",
+  "confirmations.delete.title": "Izdzēst ierakstu?",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
+  "confirmations.delete_list.title": "Izdzēst sarakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.edit.confirm": "Labot",
   "confirmations.edit.message": "Labošana pārrakstīs ziņojumu, kas šobrīd tiek sastādīts. Vai tiešām turpināt?",
+  "confirmations.edit.title": "Pārrakstīt ierakstu?",
   "confirmations.logout.confirm": "Iziet",
   "confirmations.logout.message": "Vai tiešām vēlies izrakstīties?",
+  "confirmations.logout.title": "Atteikties?",
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
   "confirmations.reply.confirm": "Atbildēt",
   "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
+  "confirmations.reply.title": "Pārrakstīt ierakstu?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
   "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
+  "confirmations.unfollow.title": "Pārtraukt sekošanu lietotājam?",
+  "content_warning.hide": "Paslēpt ierakstu",
+  "content_warning.show": "Tomēr rādīt",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
@@ -649,7 +660,6 @@
   "status.edit": "Labot",
   "status.edited": "Pēdējoreiz labots {date}",
   "status.edited_x_times": "Labots {count, plural, zero {{count} reižu} one {{count} reizi} other {{count} reizes}}",
-  "status.embed": "Iegult",
   "status.favourite": "Izlasē",
   "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 48ea29f983..5ed6f219db 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -308,7 +308,6 @@
   "status.delete": "മായ്ക്കുക",
   "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ഉൾച്ചേർക്കുക",
   "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക",
   "status.media_hidden": "മീഡിയ മറച്ചു",
   "status.mention": "@{name} സൂചിപ്പിക്കുക",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index c6bc630bfe..44403ec959 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -613,7 +613,6 @@
   "status.direct_indicator": "Sebutan peribadi",
   "status.edit": "Sunting",
   "status.edited_x_times": "Disunting {count, plural, other {{count} kali}}",
-  "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
   "status.history.created": "{name} mencipta pada {date}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 2127d69baa..e93b47fd54 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -589,7 +589,6 @@
   "status.direct_indicator": "သီးသန့်ဖော်ပြခြင်း။",
   "status.edit": "ပြင်ဆင်ရန်",
   "status.edited_x_times": "{count, plural, one {{count} time} other {{count} times}} ပြင်ဆင်ခဲ့သည်",
-  "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filter": "ဤပို့စ်ကို စစ်ထုတ်ပါ",
   "status.history.created": "{name} က {date} က ဖန်တီးခဲ့သည်",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index e5d8e8d2eb..d4c6b727f7 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -789,7 +789,7 @@
   "status.edit": "Bewerken",
   "status.edited": "Laatste bewerking op {date}",
   "status.edited_x_times": "{count, plural, one {{count} keer} other {{count} keer}} bewerkt",
-  "status.embed": "Embedden",
+  "status.embed": "Embed-code verkrijgen",
   "status.favourite": "Favoriet",
   "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index d21ebffe22..3d0634ef61 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -789,7 +789,7 @@
   "status.edit": "Rediger",
   "status.edited": "Sist endra {date}",
   "status.edited_x_times": "Redigert {count, plural, one {{count} gong} other {{count} gonger}}",
-  "status.embed": "Bygg inn",
+  "status.embed": "Få innbyggingskode",
   "status.favourite": "Favoritt",
   "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index b805b98528..1222f40424 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -727,7 +727,6 @@
   "status.direct_indicator": "Privat omtale",
   "status.edit": "Rediger",
   "status.edited_x_times": "Redigert {count, plural,one {{count} gang} other {{count} ganger}}",
-  "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
   "status.history.created": "{name} opprettet {date}",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 1d9008dbd1..22193f82aa 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -505,7 +505,6 @@
   "status.direct_indicator": "Mencion privada",
   "status.edit": "Modificar",
   "status.edited_x_times": "Modificat {count, plural, un {{count} còp} other {{count} còps}}",
-  "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
   "status.filter": "Filtrar aquesta publicacion",
   "status.history.created": "{name} o creèt lo {date}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index a71c01b3c1..5da88ff08f 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -320,7 +320,6 @@
   "status.delete": "ਹਟਾਓ",
   "status.edit": "ਸੋਧ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ਮੜ੍ਹੋ",
   "status.favourite": "ਪਸੰਦ",
   "status.history.created": "{name} ਨੇ {date} ਨੂੰ ਬਣਾਇਆ",
   "status.history.edited": "{name} ਨੇ {date} ਨੂੰ ਸੋਧਿਆ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2ef437ef04..34154fe5a3 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -789,7 +789,7 @@
   "status.edit": "Edytuj",
   "status.edited": "Ostatnio edytowane {date}",
   "status.edited_x_times": "Edytowano {count, plural, one {{count} raz} other {{count} razy}}",
-  "status.embed": "Osadź",
+  "status.embed": "Kod osadzenia",
   "status.favourite": "Dodaj do ulubionych",
   "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 9978bf7644..235cec145d 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -789,7 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
-  "status.embed": "Incorporar",
+  "status.embed": "Obter código de incorporação",
   "status.favourite": "Favorita",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 24f5993112..1dc4bc5109 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -359,6 +359,8 @@
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_follows": "Veja mais perfis seguidos em {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
+  "hints.threads.replies_may_be_missing": "As respostas de outros servidores podem estar a faltar.",
+  "hints.threads.see_more": "Veja mais respostas em {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicações",
@@ -366,6 +368,9 @@
   "home.pending_critical_update.link": "Ver atualizações",
   "home.pending_critical_update.title": "Atualização de segurança crítica disponível!",
   "home.show_announcements": "Exibir comunicações",
+  "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar utilizadores que ignoraste as notificações deles. Ignorar notificações não irá parar as mensagens serem enviadas.",
+  "ignore_notifications_modal.filter_instead": "Filtrar em vez disso",
+  "ignore_notifications_modal.filter_to_act_users": "Ainda poderá aceitar, rejeitar, ou reportar utilizadores",
   "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar assinalar esta publicação como favorita para que o autor saiba que gostou e guardá-la para mais tarde.",
   "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
@@ -749,7 +754,6 @@
   "status.edit": "Editar",
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
-  "status.embed": "Embutir",
   "status.favourite": "Assinalar como favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 18380928b3..73b8140de6 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -556,7 +556,6 @@
   "status.direct_indicator": "Mențiune privată",
   "status.edit": "Modifică",
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
-  "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
   "status.history.created": "creată de {name} pe {date}",
   "status.history.edited": "modificată de {name} pe {date}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index ab89743467..e335bff299 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -716,7 +716,6 @@
   "status.edit": "Изменить",
   "status.edited": "Дата последнего изменения: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
-  "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
   "status.filter": "Фильтровать этот пост",
   "status.history.created": "{name} создал {date}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index ac715e718e..85bd9aa9dd 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -503,7 +503,6 @@
   "status.detailed_status": "विस्तृतसंभाषणदृश्यम्",
   "status.edit": "सम्पादय",
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
-  "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
   "status.history.created": "{name} असृजत् {date}",
   "status.history.edited": "{name} समपादयत् {date}",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 0e055716e1..ecf5141eb5 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -545,7 +545,6 @@
   "status.detailed_status": "Visualizatzione de detàlliu de arresonada",
   "status.edit": "Modìfica",
   "status.edited_x_times": "Modificadu {count, plural, one {{count} # borta} other {{count} bortas}}",
-  "status.embed": "Afissa",
   "status.favourites": "{count, plural, one {preferidu} other {preferidos}}",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index b1b17b57db..269e29a86f 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -474,7 +474,6 @@
   "status.detailed_status": "Detailt conversation view",
   "status.edit": "Edit",
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
-  "status.embed": "Embed",
   "status.filter": "Filter this post",
   "status.history.created": "{name} creatit {date}",
   "status.history.edited": "{name} editit {date}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index a9288fd104..93ce9dd7e2 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -415,7 +415,6 @@
   "status.detailed_status": "විස්තරාත්මක සංවාද දැක්ම",
   "status.edit": "සංස්කරණය",
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
-  "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
   "status.history.created": "{name} නිර්මාණය {date}",
   "status.history.edited": "{name} සංස්කරණය {date}",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index f89e8cf5ab..d21dc5e1ab 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -702,7 +702,6 @@
   "status.edit": "Upraviť",
   "status.edited": "Naposledy upravený {date}",
   "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
-  "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.history.created": "Vytvorené účtom {name} {date}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 4e83b15089..183636a653 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -746,7 +746,6 @@
   "status.edit": "Uredi",
   "status.edited": "Zadnje urejanje {date}",
   "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
-  "status.embed": "Vdelaj",
   "status.favourite": "Priljubljen_a",
   "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 1904c186f7..745bba179f 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -789,7 +789,7 @@
   "status.edit": "Përpunojeni",
   "status.edited": "Përpunuar së fundi më {date}",
   "status.edited_x_times": "Përpunuar {count, plural, one {{count} herë} other {{count} herë}}",
-  "status.embed": "Trupëzim",
+  "status.embed": "Merrni kod trupëzimi",
   "status.favourite": "I vini shenjë si të parapëlqyer",
   "status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
   "status.filter": "Filtroje këtë postim",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 02be70f5bf..de30ca280f 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -706,7 +706,6 @@
   "status.edit": "Uredi",
   "status.edited": "Poslednje uređivanje {date}",
   "status.edited_x_times": "Uređeno {count, plural, one {{count} put} other {{count} puta}}",
-  "status.embed": "Ugradi",
   "status.favourite": "Omiljeno",
   "status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
   "status.filter": "Filtriraj ovu objavu",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index dfd10579e6..255215a167 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -706,7 +706,6 @@
   "status.edit": "Уреди",
   "status.edited": "Последње уређивање {date}",
   "status.edited_x_times": "Уређено {count, plural, one {{count} пут} other {{count} пута}}",
-  "status.embed": "Угради",
   "status.favourite": "Омиљено",
   "status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
   "status.filter": "Филтрирај ову објаву",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 61cad916ca..14fac1ec8d 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -783,7 +783,7 @@
   "status.edit": "Redigera",
   "status.edited": "Senast ändrad {date}",
   "status.edited_x_times": "Redigerad {count, plural, one {{count} gång} other {{count} gånger}}",
-  "status.embed": "Bädda in",
+  "status.embed": "Hämta kod för inbäddning",
   "status.favourite": "Favoritmarkera",
   "status.favourites": "{count, plural, one {favorit} other {favoriter}}",
   "status.filter": "Filtrera detta inlägg",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 4f209b7e3e..87d6660f05 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -345,7 +345,6 @@
   "status.delete": "நீக்கு",
   "status.detailed_status": "விரிவான உரையாடல் காட்சி",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "கிடத்து",
   "status.load_more": "அதிகமாய் ஏற்று",
   "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
   "status.mention": "குறிப்பிடு @{name}",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index a6dc74b290..40fbd7f7bd 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -245,7 +245,6 @@
   "status.delete": "తొలగించు",
   "status.detailed_status": "వివరణాత్మక సంభాషణ వీక్షణ",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "ఎంబెడ్",
   "status.load_more": "మరిన్ని లోడ్ చేయి",
   "status.media_hidden": "మీడియా దాచబడింది",
   "status.mention": "@{name}ను ప్రస్తావించు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 81424a9490..b8c942f999 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -787,7 +787,6 @@
   "status.edit": "แก้ไข",
   "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
-  "status.embed": "ฝัง",
   "status.favourite": "ชื่นชอบ",
   "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 0ca30c57da..6c21026bdb 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -359,7 +359,6 @@
   "status.cancel_reblog_private": "o pini e pana",
   "status.delete": "o weka",
   "status.edit": "o ante",
-  "status.embed": "ni o lon insa pi lipu ante",
   "status.favourite": "o sitelen pona",
   "status.history.created": "{name} li pali e ni lon {date}",
   "status.history.edited": "{name} li ante lon {date}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 6577737bf1..5e875ff64f 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -789,7 +789,7 @@
   "status.edit": "Düzenle",
   "status.edited": "Son düzenleme {date}",
   "status.edited_x_times": "{count, plural, one {{count} kez} other {{count} kez}} düzenlendi",
-  "status.embed": "Gömülü",
+  "status.embed": "Gömme kodunu al",
   "status.favourite": "Favori",
   "status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
   "status.filter": "Bu gönderiyi süzgeçle",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 1439e2ef58..01429f9431 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -410,7 +410,6 @@
   "status.direct_indicator": "Хосусый искә алу",
   "status.edit": "Үзгәртү",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
-  "status.embed": "Веб-биткә кертү",
   "status.history.created": "{name} ясалды {date}",
   "status.history.edited": "{name} төзәтте {date}",
   "status.load_more": "Күбрәк йөкләү",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 638a84b64f..a9fd44ee6c 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -789,7 +789,7 @@
   "status.edit": "Редагувати",
   "status.edited": "Востаннє змінено {date}",
   "status.edited_x_times": "Відредаговано {count, plural, one {{count} раз} few {{count} рази} many {{counter} разів} other {{counter} разів}}",
-  "status.embed": "Вбудувати",
+  "status.embed": "Отримати код вставки",
   "status.favourite": "Уподобане",
   "status.favourites": "{count, plural, one {вподобання} few {вподобання} many {вподобань} other {вподобання}}",
   "status.filter": "Фільтрувати цей допис",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 09f288469d..449435847e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -787,7 +787,6 @@
   "status.edit": "Sửa",
   "status.edited": "Sửa lần cuối {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
-  "status.embed": "Nhúng",
   "status.favourite": "Thích",
   "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 9a6076f23f..dd86b92cce 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -789,7 +789,7 @@
   "status.edit": "编辑",
   "status.edited": "最近编辑于 {date}",
   "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "嵌入",
+  "status.embed": "获取嵌入代码",
   "status.favourite": "喜欢",
   "status.favourites": "{count, plural, other {次喜欢}}",
   "status.filter": "过滤此嘟文",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 2a55e6fc20..6fc1b9d267 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -699,7 +699,6 @@
   "status.edit": "編輯",
   "status.edited": "最後編輯於 {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "嵌入",
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, one {則最愛} other {則最愛}}",
   "status.filter": "篩選此帖文",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index cdc6c977b7..a2168c42a4 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -789,7 +789,7 @@
   "status.edit": "編輯",
   "status.edited": "上次編輯於 {date}",
   "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
-  "status.embed": "內嵌嘟文",
+  "status.embed": "取得嵌入程式碼",
   "status.favourite": "最愛",
   "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",
diff --git a/config/locales/activerecord.es-MX.yml b/config/locales/activerecord.es-MX.yml
index 882c40ae8d..4d2cba3a27 100644
--- a/config/locales/activerecord.es-MX.yml
+++ b/config/locales/activerecord.es-MX.yml
@@ -15,6 +15,12 @@ es-MX:
       user/invite_request:
         text: Motivo
     errors:
+      attributes:
+        domain:
+          invalid: no es un nombre de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
+        too_many_lines: excede el límite de %{limit} líneas
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 569b783103..16e2c66cbe 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -15,6 +15,12 @@ es:
       user/invite_request:
         text: Razón
     errors:
+      attributes:
+        domain:
+          invalid: no es un nombre de dominio válido
+      messages:
+        invalid_domain_on_line: "%{value} no es un nombre de dominio válido"
+        too_many_lines: excede el límite de %{limit} líneas
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fr-CA.yml b/config/locales/activerecord.fr-CA.yml
index 1a83a0e9e2..b6f005d220 100644
--- a/config/locales/activerecord.fr-CA.yml
+++ b/config/locales/activerecord.fr-CA.yml
@@ -15,6 +15,9 @@ fr-CA:
       user/invite_request:
         text: Raison
     errors:
+      attributes:
+        domain:
+          invalid: n'est pas un nom de domaine valide
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 24bb39502b..05eb7ce67b 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -15,6 +15,9 @@ fr:
       user/invite_request:
         text: Motif
     errors:
+      attributes:
+        domain:
+          invalid: n'est pas un nom de domaine valide
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.lv.yml b/config/locales/activerecord.lv.yml
index 5e41f4630e..b7e2db65e8 100644
--- a/config/locales/activerecord.lv.yml
+++ b/config/locales/activerecord.lv.yml
@@ -15,6 +15,12 @@ lv:
       user/invite_request:
         text: Iemesls
     errors:
+      attributes:
+        domain:
+          invalid: nav derīgs domēna nosaukums
+      messages:
+        invalid_domain_on_line: "%{value} nav derīgs domēna nosaukums"
+        too_many_lines: pārsniedz %{limit} līniju ierobežojumu
       models:
         account:
           attributes:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 480feeba2d..7512e03fd5 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -53,6 +53,7 @@ ar:
         title: تعديل عنوان البريد الإلكتروني الخاص بـ %{username}
       change_role:
         changed_msg: تم تغيير بنجاح!
+        edit_roles: إدارة أدوار المستخدمين
         label: تغيير الدور
         no_role: بلا دور
         title: تغيير دور %{username}
@@ -1164,6 +1165,11 @@ ar:
       view_strikes: عرض العقوبات السابقة المُطَبَّقة ضد حسابك
     too_fast: تم إرسال النموذج بسرعة كبيرة، حاول مرة أخرى.
     use_security_key: استخدام مفتاح الأمان
+  author_attribution:
+    example_title: عينة نص
+    more_from_html: المزيد من %{name}
+    s_blog: مدونة %{name}
+    title: إسناد المؤلف
   challenge:
     confirm: واصل
     hint_html: "<strong>توصية:</strong> لن نطلب منك ثانية كلمتك السرية في غضون الساعة اللاحقة."
@@ -1971,6 +1977,7 @@ ar:
     instructions_html: قم بنسخ ولصق التعليمة البرمجية أدناه في شفرة HTML لموقعك الخاص على الويب. ثم أضف عنوان موقع الويب الخاص بك إلى أحد الحقول الإضافية في ملفك التعريفي عبر لسان "تعديل الملف التعريفي" ثم احفظ التغييرات.
     verification: التحقق
     verified_links: روابطك التي تم التحقق منها
+    website_verification: التحقق من موقع الويب
   webauthn_credentials:
     add: إضافة مفتاح أمان جديد
     create:
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 11c5020305..0f05adf148 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -83,6 +83,7 @@ lv:
         access_denied: Resursa īpašnieks vai autorizācijas serveris pieprasījumu noraidīja.
         credential_flow_not_configured: Resursa īpašnieka paroles akreditācijas datu plūsma neizdevās, jo Doorkeeper.configure.resource_owner_from_credentials nebija konfigurēts.
         invalid_client: Klienta autentifikācija neizdevās nezināma klienta, klienta autentifikācijas vai neatbalstītas autentifikācijas metodes dēļ.
+        invalid_code_challenge_method: Koda izaicinājuma veidam jābūt S256, vienkāršs netiek atbalstīts.
         invalid_grant: Sniegtā autorizācijas piekrišana nav derīga, tai ir beidzies derīguma termiņš, tā ir atsaukta, tā neatbilst autorizācijas pieprasījumā izmantotajam novirzīšanas URI vai tika izsniegta citam klientam.
         invalid_redirect_uri: Iekļauts novirzīšanas uri nav derīgs.
         invalid_request:
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 050388c180..7916e27f3a 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -24,6 +24,8 @@ es-MX:
   admin:
     account_actions:
       action: Realizar acción
+      already_silenced: Esta cuenta ya ha sido limitada.
+      already_suspended: Esta cuenta ya ha sido suspendida.
       title: Moderar %{acct}
     account_moderation_notes:
       create: Crear
@@ -45,6 +47,7 @@ es-MX:
         title: Cambiar el correo electrónico de %{username}
       change_role:
         changed_msg: Rol cambiado exitosamente!
+        edit_roles: Administrar roles de usuario
         label: Cambiar de rol
         no_role: Sin rol
         title: Cambiar el rol para %{username}
@@ -601,6 +604,7 @@ es-MX:
         suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y eventualmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los reportes contra esta cuenta.
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
+      actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
       add_to_report: Añadir más al reporte
       already_suspended_badges:
         local: Ya suspendido en este servidor
@@ -1156,6 +1160,12 @@ es-MX:
       view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     use_security_key: Usar la clave de seguridad
+  author_attribution:
+    example_title: Texto de ejemplo
+    hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+    more_from_html: Más de %{name}
+    s_blog: Blog de %{name}
+    title: Atribución del autor
   challenge:
     confirm: Continuar
     hint_html: "<strong>Tip:</strong> No volveremos a preguntarte por la contraseña durante la siguiente hora."
@@ -1933,6 +1943,7 @@ es-MX:
     instructions_html: Copia y pega el siguiente código en el HTML de tu sitio web. A continuación, añade la dirección de su sitio web en uno de los campos extra de tu perfil desde la pestaña "Editar perfil" y guarda los cambios.
     verification: Verificación
     verified_links: Tus links verificados
+    website_verification: Verificación del sitio web
   webauthn_credentials:
     add: Agregar nueva clave de seguridad
     create:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 81a547ad88..16716641f9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -24,6 +24,8 @@ es:
   admin:
     account_actions:
       action: Realizar acción
+      already_silenced: Esta cuenta ya ha sido limitada.
+      already_suspended: Esta cuenta ya ha sido suspendida.
       title: Moderar %{acct}
     account_moderation_notes:
       create: Crear
@@ -45,6 +47,7 @@ es:
         title: Cambiar el correo electrónico de %{username}
       change_role:
         changed_msg: "¡Rol cambiado con éxito!"
+        edit_roles: Administrar roles de usuario
         label: Cambiar rol
         no_role: Sin rol
         title: Cambiar rol para %{username}
@@ -601,6 +604,7 @@ es:
         suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y finalmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los informes contra esta cuenta.
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
+      actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
       add_to_report: Añadir más al reporte
       already_suspended_badges:
         local: Ya suspendido en este servidor
@@ -1156,6 +1160,12 @@ es:
       view_strikes: Ver amonestaciones pasadas contra tu cuenta
     too_fast: Formulario enviado demasiado rápido, inténtelo de nuevo.
     use_security_key: Usar la clave de seguridad
+  author_attribution:
+    example_title: Texto de ejemplo
+    hint_html: Controla cómo se te dará atribución cuando se compartan enlaces en Mastodon.
+    more_from_html: Más de %{name}
+    s_blog: Blog de %{name}
+    title: Atribución del autor
   challenge:
     confirm: Continuar
     hint_html: "<strong>Tip:</strong> No volveremos a preguntarte por la contraseña durante la siguiente hora."
@@ -1933,6 +1943,7 @@ es:
     instructions_html: Copia y pega el siguiente código en el HTML de tu sitio web. A continuación, añade la dirección de su sitio web en uno de los campos extra de tu perfil desde la pestaña "Editar perfil" y guarda los cambios.
     verification: Verificación
     verified_links: Tus enlaces verificados
+    website_verification: Verificación del sitio web
   webauthn_credentials:
     add: Agregar nueva clave de seguridad
     create:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index f2fe134e32..996c8d6cd2 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -24,12 +24,15 @@ fa:
   admin:
     account_actions:
       action: انجامِ کنش
+      already_silenced: این جساب از پیش محدود شده.
+      already_suspended: این جساب از پیش معلّق شده.
       title: انجام کنش مدیریتی روی %{acct}
     account_moderation_notes:
       create: افزودن یادداشت
       created_msg: یادداشت مدیر با موفقیت ساخته شد!
       destroyed_msg: یادداشت نظارتی با موفقیت نابود شد!
     accounts:
+      add_email_domain_block: انسداد دامنهٔ رایانامه
       approve: پذیرفتن
       approved_msg: کارهٔ ثبت‌نام %{username} با موفقیت تأیید شد
       are_you_sure: مطمئنید؟
@@ -44,6 +47,7 @@ fa:
         title: تغییر رایانامه برای %{username}
       change_role:
         changed_msg: نقش با موفقیت تغییر کرد!
+        edit_roles: مدیریت نقش‌های کاربر
         label: تغییر نقش
         no_role: بدون نقش
         title: تغییر نقش برای %{username}
@@ -56,6 +60,7 @@ fa:
       demote: تنزل‌دادن
       destroyed_msg: داده‌های %{username} در صف حدف قرار گرفتند
       disable: از کار انداختن
+      disable_sign_in_token_auth: از کار انداختن تأیید هویت ژتون رایانامه‌ای
       disable_two_factor_authentication: از کار انداختن ورود دومرحله‌ای
       disabled: از کار افتاده
       display_name: نام نمایشی
@@ -64,6 +69,7 @@ fa:
       email: رایانامه
       email_status: وضعیت رایانامه
       enable: به کار انداختن
+      enable_sign_in_token_auth: به کار انداختن تأیید هویت ژتون رایانامه‌ای
       enabled: به کار افتاده
       enabled_msg: حساب %{username} با موفقیت به کار انداخته شد
       followers: پیگیران
@@ -128,6 +134,7 @@ fa:
       resubscribe: اشتراک دوباره
       role: نقش
       search: جست‌وجو
+      search_same_email_domain: دیگر کاربران با دامنهٔ رایانامهٔ یکسان
       search_same_ip: دیگر کاربران با IP یکسان
       security: امنیت
       security_measures:
@@ -168,13 +175,16 @@ fa:
         approve_appeal: پذیرش درخواست تجدیدنظر
         approve_user: تایید کاربر
         assigned_to_self_report: واگذاری گزارش
+        change_email_user: تغییر رایانامه برای کاربر
         change_role_user: تغیر نقش کاربر
         confirm_user: تأیید کاربر
         create_account_warning: ایجاد هشدار
         create_announcement: ایجاد اعلامیه
+        create_canonical_email_block: ایجاد انسداد رایانامه
         create_custom_emoji: ایجاد اموجی سفارشی
         create_domain_allow: ایجاد اجازهٔ دامنه
         create_domain_block: ایجاد انسداد دامنه
+        create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
         create_ip_block: ایجاد قاعدهٔ آی‌پی
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
         create_user_role: ایجاد نقش
@@ -214,6 +224,7 @@ fa:
         update_custom_emoji: به‌روز رسانی اموجی سفارشی
         update_domain_block: به‌روزرسانی مسدودسازی دامنه
         update_ip_block: بروزرسانی قاعدهٔ آی‌پی
+        update_report: به‌روز رسانی گزارش
         update_status: به‌روز رسانی وضعیت
         update_user_role: به روزرسانی نقش
       actions:
@@ -250,6 +261,7 @@ fa:
         reject_user_html: "%{name} ثبت نام %{target} را رد کرد"
         remove_avatar_user_html: "%{name} تصویر نمایهٔ %{target} را حذف کرد"
         reopen_report_html: "%{name} گزارش %{target} را دوباره به جریان انداخت"
+        resend_user_html: "%{name} رایانامهٔ تأیید برای %{target} را دوباره فرستاد"
         reset_password_user_html: "%{name} گذرواژه کاربر %{target} را بازنشاند"
         resolve_report_html: "%{name} گزارش %{target} را رفع کرد"
         sensitive_account_html: "%{name} رسانهٔ %{target} را به عنوان حساس علامت‌گذاری کرد"
@@ -264,6 +276,7 @@ fa:
         update_custom_emoji_html: "%{name} شکلک %{target} را به‌روز کرد"
         update_domain_block_html: "%{name} مسدودسازی دامنه را برای %{target} به‌روزرسانی کرد"
         update_ip_block_html: "%{name} قانون آی‌پی %{target} را تغییر داد"
+        update_report_html: "%{name} گزارش %{target} را به‌روز کرد"
         update_status_html: "%{name} نوشتهٔ %{target} را به‌روز کرد"
         update_user_role_html: "%{name} نقش %{target} را تغییر داد"
       deleted_account: حساب حذف شد
@@ -271,6 +284,7 @@ fa:
       filter_by_action: پالایش بر اساس کنش
       filter_by_user: پالایش بر اساس کاربر
       title: سیاههٔ بازرسی
+      unavailable_instance: "(نام دامنه ناموجود)"
     announcements:
       destroyed_msg: اعلامیه با موفقیت حذف شد!
       edit:
@@ -405,6 +419,7 @@ fa:
       attempts_over_week:
         one: "%{count} تلاش در هفتهٔ گذشته"
         other: "%{count} تلاش ورود در هفتهٔ گذشته"
+      created_msg: دامنهٔ رایانامه با موفقیت مسدود شد
       delete: پاک‌کردن
       dns:
         types:
@@ -413,7 +428,10 @@ fa:
       new:
         create: ساختن مسدودسازی
         resolve: حل و فصل دامنه
+        title: مسدودسازی دامنهٔ رایانامهٔ جدید
+      no_email_domain_block_selected: هیچ انسداد دامنهٔ رایانامه‌ای تغییر نکرد زیرا هیچ‌کدامشان انتخاب نشده بودند
       not_permitted: مجاز نیست
+      title: دامنه‌های رایانامهٔ مسدود شده
     export_domain_allows:
       new:
         title: درون‌ریزی اجازه‌های دامنه
@@ -586,6 +604,7 @@ fa:
       target_origin: خاستگاه حساب گزارش‌شده
       title: گزارش‌ها
       unassign: پس‌گرفتن مسئولیت
+      unknown_action_msg: 'کنش ناشناخته: %{action}'
       unresolved: حل‌نشده
       updated_at: به‌روز شد
       view_profile: دیدن نمایه
@@ -625,6 +644,7 @@ fa:
         manage_taxonomies: مدیریت طیقه‌بندی‌ها
         manage_user_access: مدیریت دسترسی کاربران
         manage_users: مدیریت کاربران
+        manage_webhooks: مدیریت قلّاب‌های وب
         view_dashboard: دیدن داشبورد
         view_dashboard_description: اجازه به کاربران برای دسترسی به داشتبورد و سنجه‌های مختلف
         view_devops: دواپس
@@ -643,6 +663,8 @@ fa:
       appearance:
         preamble: سفارشی‌سازی رابطس وب ماستودون.
         title: ظاهر
+      branding:
+        title: ویژندگی
       default_noindex:
         title: درخواست خروج از اندیس‌گذاری پیش‌گزیدهٔ موتور جست‌وجو
       discovery:
@@ -743,6 +765,16 @@ fa:
         action: برای اطّلاعات بیش‌تر این‌جا را بررسی کنید
         message_html: "<strong>ذخیره‌سازتان بد پیکربندی شده. محرمانگی کاربرانتان در خطر است.</strong>"
     tags:
+      moderation:
+        not_trendable: غیر قابل داغ شدن
+        not_usable: غير قابل استفاده
+        pending_review: بازبینی منتظر
+        review_requested: بازبینی درخواست شده
+        reviewed: بازبینی شده
+        title: وضعیت
+        trendable: قابل داغ شدن
+        unreviewed: بررسی نشده
+        usable: قابل استفاده
       review: وضعیت بازبینی
       updated_msg: تنظیمات برچسب‌ها با موفقیت به‌روز شد
     title: مدیریت
@@ -753,15 +785,25 @@ fa:
       links:
         allow: اجازه به پیوند
         allow_provider: اجازه به ناشر
+        confirm_disallow: مطمئنید که می خواهید پیوندهای گزیده را ممنوع کنید؟
+        confirm_disallow_provider: مطمئنید که می خواهید فراهم کننده‌های گزیده را ممنوع کنید؟
         disallow: اجازه ندادن به پیوند
         disallow_provider: اجازه ندادن به ناشر
         no_link_selected: هیچ پیوندی تغییر نکرد زیرا هیچ‌کدام از آن‌ها انتخاب نشده بودند
+        publishers:
+          no_publisher_selected: هیچ ناشری تغییر نکرد زیرا هیچ‌کدام از آن‌ها انتخاب نشده بودند
         title: پیوندهای داغ
+      not_allowed_to_trend: اجازهٔ داغ شدن ندارد
       pending_review: بازبینی منتظر
       preview_card_providers:
         title: ناشران
       rejected: رد شده
       statuses:
+        allow: اجازه به فرسته
+        allow_account: اجازه به نگارنده
+        disallow: ممنوع کردن فرسته
+        disallow_account: ممنوع کردن نگارنده
+        no_status_selected: هیچ فرستهٔ داغی تغییری نکرد زیرا هیچ‌کدام از آن‌ها انتخاب نشده بودند
         title: فرسته‌های داغ
       tags:
         current_score: امتیاز کنونی %{score}
@@ -845,7 +887,9 @@ fa:
       guide_link_text: همه می‌توانند کمک کنند.
     sensitive_content: محتوای حساس
   application_mailer:
+    notification_preferences: تغییر ترجیحات رایانامه
     salutation: "%{name}،"
+    settings: 'تغییر ترجیحات رایانامه: %{link}'
     unsubscribe: لغو اشتراک
     view: 'نمایش:'
     view_profile: دیدن نمایه
@@ -863,6 +907,7 @@ fa:
     captcha_confirmation:
       title: بررسی های امنیتی
     confirmations:
+      awaiting_review_title: ثبت‌نامتان دارد بررسی می‌شود
       login_link: ورود
       welcome_title: خوش آمدید، %{name}!
     delete_account: پاک‌کردن حساب
@@ -914,6 +959,10 @@ fa:
       view_strikes: دیدن شکایت‌های گذشته از حسابتان
     too_fast: فرم با سرعت بسیار زیادی فرستاده شد، دوباره تلاش کنید.
     use_security_key: استفاده از کلید امنیتی
+  author_attribution:
+    example_title: متن نمونه
+    more_from_html: بیش‌تر از %{name}
+    s_blog: بلاگ %{name}
   challenge:
     confirm: ادامه
     hint_html: "<strong>نکته:</strong> ما در یک ساعت آینده گذرواژه‌تان را از شما نخواهیم پرسید."
@@ -1079,6 +1128,9 @@ fa:
     none: هیچ‌کدام
     order_by: مرتب‌سازی
     save_changes: ذخیرهٔ تغییرات
+    select_all_matching_items:
+      one: گزینش %{count} مورد مطابق با جست‌وجویتان.
+      other: گزینش %{count} مورد مطابق با جست‌وجویتان.
     today: امروز
     validation_errors:
       one: یک چیزی هنوز درست نیست! لطفاً خطاهای زیر را ببینید
@@ -1087,6 +1139,7 @@ fa:
     errors:
       over_rows_processing_limit: دارای بیش از %{count} ردیف
       too_large: حجم فایل خیلی بزرگ است
+    failures: شکست‌ها
     imported: وارد شد
     modes:
       merge: ادغام
@@ -1103,11 +1156,23 @@ fa:
     status: وضعیت
     success: داده‌های شما با موفقیت بارگذاری شد و به زودی پردازش می‌شود
     time_started: آغاز شده در
+    titles:
+      blocking: درون ریختن حساب‌های مسدود
+      bookmarks: درون ریختن نشانک‌ها
+      domain_blocking: درون ریختن دامنه‌های مسدود
+      following: درون ریختن حساب‌های پی‌گرفته
+      lists: درون ریختن سیاهه‌ها
+      muting: درون ریختن حساب‌های خموش
+    type: گونهٔ درون‌ریزی
+    type_groups:
+      constructive: پی‌گیری‌ها و نشانک‌ها
+      destructive: انسدادها و خموشی‌ها
     types:
       blocking: سیاههٔ انسداد
       bookmarks: نشانک‌ها
       domain_blocking: سیاههٔ انسداد دامنه
       following: سیاههٔ پی‌گیری
+      lists: سیاهه‌ها
       muting: سیاههٔ خموشی
     upload: بارگذاری
   invites:
@@ -1140,6 +1205,7 @@ fa:
     authentication_methods:
       otp: کارهٔ تأیید هویت دوعاملی
       password: گذرواژه
+      sign_in_token: کد امنیتی رایانامه‌ای
       webauthn: کلیدهای امنیتی
     description_html: اگر فعالیتی می‌بینید که تشخیصش نمی‌دهید، تغییر گذرواژه و به کار انداختن تأیید هویت دوعاملی را در نظر داشته باشید.
     empty: هیچ تاریخچه‌ای از تأییدهویت موجود نیست
@@ -1315,6 +1381,8 @@ fa:
     over_daily_limit: شما از حد مجاز %{limit} فرسته زمان‌بندی‌شده در آن روز فراتر رفته‌اید
     over_total_limit: شما از حد مجاز %{limit} فرسته زمان‌بندی‌شده فراتر رفته‌اید
     too_soon: زمان تعیین‌شده باید در آینده باشد
+  self_destruct:
+    title: این کارساز دارد بسته می‌شود
   sessions:
     activity: آخرین فعالیت
     browser: مرورگر
@@ -1339,6 +1407,7 @@ fa:
       unknown_browser: مرورگر ناشناخته
       weibo: وبیو
     current_session: نشست فعلی
+    date: تاریخ
     description: "%{browser} روی %{platform}"
     explanation: مرورگرهای زیر هم‌اینک به حساب شما وارد شده‌اند.
     ip: آی‌پی
@@ -1375,6 +1444,7 @@ fa:
     import: درون‌ریزی
     import_and_export: درون‌ریزی و برون‌بری
     migrate: انتقال حساب
+    notifications: آگاهی‌های رایانامه‌ای
     preferences: ترجیحات
     profile: نمایه
     relationships: پیگیری‌ها و پیگیران
@@ -1382,6 +1452,9 @@ fa:
     strikes: شکایت‌های مدیریتی
     two_factor_authentication: ورود دومرحله‌ای
     webauthn_authentication: کلیدهای امنیتی
+  severed_relationships:
+    download: بارگیری (%{count})
+    type: رویداد
   statuses:
     attached:
       audio:
@@ -1520,7 +1593,16 @@ fa:
         silence: حساب محدود شده است
         suspend: حساب معلق شده است
     welcome:
+      apps_android_action: گرفتن از پلی گوگل
+      apps_ios_action: بارگیری روی فروشگاه کاره
+      apps_step: بارگیری کارهٔ رسمیمان.
+      apps_title: کاره‌های ماستودون
+      edit_profile_action: شخصی سازی
       explanation: نکته‌هایی که برای آغاز کار به شما کمک می‌کنند
+      follow_action: پی‌گیری
+      post_action: ایجاد
+      share_action: هم‌رسانی
+      sign_in_action: ورود
       subject: به ماستودون خوش آمدید
       title: خوش آمدید، کاربر %{name}!
   users:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 30837b6003..b48b499bbe 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1162,8 +1162,10 @@ fi:
     use_security_key: Käytä suojausavainta
   author_attribution:
     example_title: Esimerkkiteksti
+    hint_html: Määrää, kuinka tulet tunnustetuksi, kun Mastodonissa jaetaan linkkejä.
     more_from_html: Lisää tekijältä %{name}
     s_blog: Käyttäjän %{name} blogi
+    title: Tekijän tunnustus
   challenge:
     confirm: Jatka
     hint_html: "<strong>Vihje:</strong> Emme pyydä sinulta salasanaa uudelleen seuraavan tunnin aikana."
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index d5127b4ad3..266b73bb10 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -1913,6 +1913,9 @@ fo:
       follows_subtitle: Fylg vælkendar kontur
       follows_title: Hvørji tú átti at fylgt
       follows_view_more: Sí fleiri fólk at fylgja
+      hashtags_recent_count:
+        one: "%{people} fólk seinastu 2 dagarnar"
+        other: "%{people} fólk seinastu 2 dagarnar"
       hashtags_subtitle: Kanna rákið seinastu 2 dagarnar
       hashtags_title: Vælumtókt frámerki
       hashtags_view_more: Sí fleiri vælumtókt frámerki
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index a47d7447a1..5290ff5374 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -1147,6 +1147,12 @@ fr-CA:
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
     use_security_key: Utiliser la clé de sécurité
+  author_attribution:
+    example_title: Exemple de texte
+    hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+    more_from_html: Plus via %{name}
+    s_blog: Blog de %{name}
+    title: Attribution de l'auteur·e
   challenge:
     confirm: Continuer
     hint_html: "<strong>Astuce :</strong> Nous ne vous demanderons plus votre mot de passe pour la prochaine heure."
@@ -1914,6 +1920,7 @@ fr-CA:
     instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet "Modifier le profil" et enregistrez les modifications.
     verification: Vérification
     verified_links: Vos liens vérifiés
+    website_verification: Vérification du site web
   webauthn_credentials:
     add: Ajouter une nouvelle clé de sécurité
     create:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b2c692ea6f..8ee4e35acc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1147,6 +1147,12 @@ fr:
       view_strikes: Voir les sanctions précédemment appliquées à votre compte
     too_fast: Formulaire envoyé trop rapidement, veuillez réessayer.
     use_security_key: Utiliser la clé de sécurité
+  author_attribution:
+    example_title: Exemple de texte
+    hint_html: Déterminez la façon dont vous êtes crédité lorsque des liens sont partagés sur Mastodon.
+    more_from_html: Plus via %{name}
+    s_blog: Blog de %{name}
+    title: Attribution de l'auteur·e
   challenge:
     confirm: Continuer
     hint_html: "<strong>Astuce :</strong> Nous ne vous demanderons plus votre mot de passe pour la prochaine heure."
@@ -1914,6 +1920,7 @@ fr:
     instructions_html: Copiez et collez le code ci-dessous dans le code HTML de votre site web. Ajoutez ensuite l’adresse de votre site dans l’un des champs supplémentaires de votre profil à partir de l‘onglet « Modifier le profil » et enregistrez les modifications.
     verification: Vérification
     verified_links: Vos liens vérifiés
+    website_verification: Vérification du site web
   webauthn_credentials:
     add: Ajouter une nouvelle clé de sécurité
     create:
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 09e6b9ba0e..c902625eaa 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -26,6 +26,8 @@ lv:
   admin:
     account_actions:
       action: Veikt darbību
+      already_silenced: Šis konts jau ir ierobežots.
+      already_suspended: Šis konts jau ir aizturēts.
       title: Veikt moderācijas darbību %{acct}
     account_moderation_notes:
       create: Atstāt piezīmi
@@ -46,6 +48,7 @@ lv:
         title: Mainīt e-pastu %{username}
       change_role:
         changed_msg: Loma veiksmīgi nomainīta!
+        edit_roles: Pārvaldīt lietotāju lomas
         label: Mainīt lomu
         no_role: Nav lomas
         title: Mainīt lomu %{username}
@@ -131,6 +134,7 @@ lv:
       resubscribe: Pieteikties vēlreiz
       role: Loma
       search: Meklēt
+      search_same_email_domain: Citi lietotāji ar tādu pašu e-pasta domēnu
       search_same_ip: Citi lietotāji ar tādu pašu IP
       security: Drošība
       security_measures:
@@ -171,6 +175,7 @@ lv:
         approve_appeal: Apstiprināt Apelāciju
         approve_user: Apstiprināt lietotāju
         assigned_to_self_report: Piešķirt Pārskatu
+        change_email_user: Mainīt lietotāja e-pasta adresi
         change_role_user: Mainīt lietotāja lomu
         confirm_user: Apstiprināt lietotāju
         create_account_warning: Izveidot Brīdinājumu
@@ -217,13 +222,16 @@ lv:
         update_custom_emoji: Atjaunināt pielāgoto emocijzīmi
         update_domain_block: Atjaunināt Domēna Bloku
         update_ip_block: Atjaunināt IP noteikumu
+        update_report: Atjaunināt atskaiti
         update_status: Atjaunināt ziņu
         update_user_role: Atjaunināt lomu
       actions:
         approve_appeal_html: "%{name} apstiprināja moderācijas lēmuma apelāciju no %{target}"
         approve_user_html: "%{name} apstiprināja reģistrēšanos no %{target}"
         assigned_to_self_report_html: "%{name} piešķīra pārskatu %{target} sev"
+        change_email_user_html: "%{name} nomainīja lietotāja %{target} e-pasta adresi"
         change_role_user_html: "%{name} nomainīja lomu uz %{target}"
+        confirm_user_html: "%{name} apstiprināja lietotāja %{target} e-pasta adresi"
         create_account_warning_html: "%{name} nosūtīja brīdinājumu %{target}"
         create_announcement_html: "%{name} izveidoja jaunu paziņojumu %{target}"
         create_custom_emoji_html: "%{name} augšupielādēja jaunu emocijzīmi %{target}"
@@ -253,6 +261,7 @@ lv:
         reject_user_html: "%{name} noraidīja reģistrēšanos no %{target}"
         remove_avatar_user_html: "%{name} noņēma %{target} profila attēlu"
         reopen_report_html: "%{name} atkārtoti atvēra ziņojumu %{target}"
+        resend_user_html: "%{name} atkārtoti nosūtīja %{target} apstiprinājuma e-pasta ziņojumu"
         reset_password_user_html: "%{name} atiestatīja paroli lietotājam %{target}"
         resolve_report_html: "%{name} atrisināja ziņojumu %{target}"
         sensitive_account_html: "%{name} atzīmēja %{target} multividi kā sensitīvu"
@@ -267,6 +276,7 @@ lv:
         update_custom_emoji_html: "%{name} atjaunināja emocijzīmi %{target}"
         update_domain_block_html: "%{name} atjaunināja domēna bloku %{target}"
         update_ip_block_html: "%{name} mainīja nosacījumu priekš IP %{target}"
+        update_report_html: "%{name} atjaunināja %{target} pārskatu"
         update_status_html: "%{name} atjaunināja ziņu %{target}"
         update_user_role_html: "%{name} nomainīja %{target} lomu"
       deleted_account: dzēsts konts
@@ -274,6 +284,7 @@ lv:
       filter_by_action: Filtrēt pēc darbības
       filter_by_user: Filtrēt pēc lietotāja
       title: Auditācijas pieraksti
+      unavailable_instance: "(domēna vārds nav pieejams)"
     announcements:
       destroyed_msg: Paziņojums ir veiksmīgi izdzēsts!
       edit:
@@ -855,7 +866,13 @@ lv:
         action: Pārbaudi šeit, lai iegūtu plašāku informāciju
         message_html: "<strong>Tava objektu krātuve ir nepareizi konfigurēta. Tavu lietotāju privātums ir apdraudēts.</strong>"
     tags:
+      moderation:
+        not_usable: Nav izmantojams
+        pending_review: Gaida pārskatīšanu
+        review_requested: Pieprasīta pārskatīšana
+        reviewed: Pārskatīts
       review: Pārskatīt stāvokli
+      title: Tēmturi
       updated_msg: Tēmtura iestatījumi ir veiksmīgi atjaunināti
     title: Administrēšana
     trends:
@@ -929,6 +946,7 @@ lv:
       delete: Dzēst
       edit_preset: Labot iepriekš iestatītus brīdinājumus
       empty: Tu vēl neesi definējis iepriekš iestatītos brīdinājumus.
+      title: Brīdinājumu priekšiestatījums
     webhooks:
       add_new: Pievienot galapunktu
       delete: Dzēst
@@ -1004,7 +1022,9 @@ lv:
       guide_link_text: Ikviens var piedalīties.
     sensitive_content: Sensitīvs saturs
   application_mailer:
+    notification_preferences: Mainīt e-pasta uztādījumus
     salutation: "%{name},"
+    settings: 'Mainīt e-pasta uztādījumus: %{link}'
     unsubscribe: Atcelt abonēšanu
     view: 'Skatīt:'
     view_profile: Skatīt profilu
@@ -1024,6 +1044,7 @@ lv:
       hint_html: Vēl tikai viena lieta! Mums ir jāapstiprina, ka tu esi cilvēks (tas ir tāpēc, lai mēs varētu nepieļaut surogātpasta izsūtīšanu!). Atrisini tālāk norādīto CAPTCHA un noklikšķini uz "Turpināt".
       title: Drošības pārbaude
     confirmations:
+      awaiting_review: E-pasta adrese ir apstiprināta. %{domain} darbinieki tagad pārskata reģistrāciju. Tiks saņemts e-pasta ziņojums, ja viņi apstiprinās kontu.
       awaiting_review_title: Tava reģistrācija tiek izskatīta
       clicking_this_link: klikšķinot šo saiti
       login_link: pieteikties
@@ -1031,6 +1052,7 @@ lv:
       redirect_to_app_html: Tev vajadzētu būt novirzītam uz lietotni <strong>%{app_name}</strong>. Ja tas nenotika, mēģini %{clicking_this_link} vai manuāli atgriezieties lietotnē.
       registration_complete: Tava reģistrācija domēnā %{domain} tagad ir pabeigta!
       welcome_title: Laipni lūdzam, %{name}!
+      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, to var mainīt konta iestatījumos.
     delete_account: Dzēst kontu
     delete_account_html: Ja vēlies dzēst savu kontu, tu vari <a href="%{path}">turpināt šeit</a>. Tev tiks lūgts apstiprinājums.
     description:
@@ -1051,6 +1073,7 @@ lv:
     or_log_in_with: Vai piesakies ar
     privacy_policy_agreement_html: Esmu izlasījis un piekrītu <a href="%{privacy_policy_path}" target="_blank">privātuma politikai</a>
     progress:
+      confirm: Apstiprināt e-pasta adresi
       details: Tavi dati
       review: Mūsu apskats
       rules: Pieņemt noteikumus
@@ -1072,8 +1095,10 @@ lv:
     security: Drošība
     set_new_password: Iestatīt jaunu paroli
     setup:
+      email_below_hint_html: Jāpārbauda sava surogātpasta mape vai jāpieprasa vēl vienu! Savu e-pasta adresi var labot, ja tā ir nepareiza.
       email_settings_hint_html: Noklikšķini uz saites, kuru mēs tev nosūtījām, lai apstiprinātu %{email}. Mēs tepat pagaidīsim.
       link_not_received: Vai nesaņēmi sati?
+      new_confirmation_instructions_sent: Pēc dažām minūtēm saņemsi jaunu e-pasta ziņojumu ar apstiprinājuma saiti.
       title: Pārbaudi savu iesūtni
     sign_in:
       preamble_html: Jāpiesakās ar saviem <strong>%{domain}</strong> piekļuves datiem. Ja Tavs konts tiek mitināts citā serverī, Tu nevarēsi šeit pieteikties.
@@ -1084,6 +1109,7 @@ lv:
       title: Atļauj tevi iestatīt %{domain}.
     status:
       account_status: Konta statuss
+      confirming: Gaida e-pasta adreses apstiprināšanas pabeigšanu.
       functional: Tavs konts ir pilnā darba kārtībā.
       redirecting_to: Tavs konts ir neaktīvs, jo pašlaik tas tiek novirzīts uz %{acct}.
       self_destruct: Tā kā %{domain} tiek slēgts, tu iegūsi tikai ierobežotu piekļuvi savam kontam.
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 0a665fb784..b591cdca57 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -3,6 +3,7 @@ ar:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: يحمي من الإسناد الزائف.
         discoverable: يمكن عرض مشاركاتك العامة وملفك الشخصي أو التوصية به في مختلف مناطق ماستدون ويمكن اقتراح ملفك الشخصي على مستخدمين آخرين.
         display_name: اسمك الكامل أو اسمك المرح.
         fields: صفحتك الرئيسية، ضمائرك، عمرك، أي شيء تريده.
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index ff66bcb59e..2a2d06ce9b 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -3,6 +3,7 @@ es-MX:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protege frente atribuciones fraudulentas.
         discoverable: Tu perfil y las publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu nick.
         fields: Tu página de inicio, pronombres, edad, todo lo que quieras.
@@ -130,6 +131,7 @@ es-MX:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán los toots en los idiomas seleccionados en los timelines públicos
+        role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
         highlighted: Esto hace que el rol sea públicamente visible
@@ -142,6 +144,7 @@ es-MX:
         url: Donde los eventos serán enviados
     labels:
       account:
+        attribution_domains_as_text: Solo permitir sitios web específicos
         discoverable: Destacar el perfil y las publicaciones en el algoritmo de descubrimiento
         fields:
           name: Etiqueta
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 143c5d8075..b22701aae7 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,6 +3,7 @@ es:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protege frente atribuciones fraudulentas.
         discoverable: Tu perfil y publicaciones públicas pueden ser destacadas o recomendadas en varias áreas de Mastodon y tu perfil puede ser sugerido a otros usuarios.
         display_name: Tu nombre completo o tu apodo.
         fields: Tu carta de presentación, pronombres, edad, lo que quieras.
@@ -130,6 +131,7 @@ es:
         name: Sólo se puede cambiar el cajón de las letras, por ejemplo, para que sea más legible
       user:
         chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
+        role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
         highlighted: Esto hace que el rol sea públicamente visible
@@ -142,6 +144,7 @@ es:
         url: Donde los eventos serán enviados
     labels:
       account:
+        attribution_domains_as_text: Solo permitir sitios web específicos
         discoverable: Destacar perfil y publicaciones en algoritmos de descubrimiento
         fields:
           name: Etiqueta
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index a2b29566f6..5c85367dbb 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -3,6 +3,7 @@ fi:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Suojaa vääriltä tunnustuksilta.
         discoverable: Julkisia julkaisujasi ja profiiliasi voidaan pitää esillä tai suositella Mastodonin eri alueilla ja profiiliasi voidaan ehdottaa toisille käyttäjille.
         display_name: Koko nimesi tai lempinimesi.
         fields: Verkkosivustosi, pronominisi, ikäsi ja mitä ikinä haluatkaan ilmoittaa.
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 1128335f11..794c3f4533 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -3,6 +3,7 @@ fr-CA:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protège contre les fausses attributions.
         discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
         display_name: Votre nom complet ou votre nom cool.
         fields: Votre page d'accueil, pronoms, âge, tout ce que vous voulez.
@@ -141,6 +142,7 @@ fr-CA:
         url: Là où les événements seront envoyés
     labels:
       account:
+        attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
         discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
         fields:
           name: Étiquette
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index c064532984..e29d9f0a94 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -3,6 +3,7 @@ fr:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Protège contre les fausses attributions.
         discoverable: Vos messages publics et votre profil peuvent être mis en avant ou recommandés dans diverses parties de Mastodon et votre profil peut être suggéré à d’autres utilisateurs.
         display_name: Votre nom complet ou votre nom rigolo.
         fields: Votre page personnelle, vos pronoms, votre âge, ce que vous voulez.
@@ -141,6 +142,7 @@ fr:
         url: Là où les événements seront envoyés
     labels:
       account:
+        attribution_domains_as_text: Autoriser uniquement des sites Web spécifiques
         discoverable: Autoriser des algorithmes de découverte à mettre en avant votre profil et vos messages
         fields:
           name: Étiquette

From 49cbee383612bb58efeebd3377acc0d618fbf80e Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 13 Sep 2024 04:43:21 -0400
Subject: [PATCH 54/89] Remove unused argument from
 `AccountMigration.within_cooldown` (#31892)

---
 app/models/account_migration.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index dc22e32942..7a01e250e2 100644
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@@ -31,10 +31,14 @@ class AccountMigration < ApplicationRecord
   validate :validate_migration_cooldown
   validate :validate_target_account
 
-  scope :within_cooldown, ->(now = Time.now.utc) { where(arel_table[:created_at].gteq(now - COOLDOWN_PERIOD)) }
+  scope :within_cooldown, -> { where(created_at: cooldown_duration_ago..) }
 
   attr_accessor :current_password, :current_username
 
+  def self.cooldown_duration_ago
+    Time.current - COOLDOWN_PERIOD
+  end
+
   def save_with_challenge(current_user)
     if current_user.encrypted_password.present?
       errors.add(:current_password, :invalid) unless current_user.valid_password?(current_password)

From a2c4f5f5c0de75fb67cee011b98c82e0d75f0fbd Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 13 Sep 2024 04:49:03 -0400
Subject: [PATCH 55/89] Add coverage for `ListAccount` follow/follow_request
 set up (#31896)

---
 app/models/list_account.rb       |  8 ++++--
 spec/models/list_account_spec.rb | 48 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 spec/models/list_account_spec.rb

diff --git a/app/models/list_account.rb b/app/models/list_account.rb
index e7016f2714..2ff8605717 100644
--- a/app/models/list_account.rb
+++ b/app/models/list_account.rb
@@ -20,13 +20,11 @@ class ListAccount < ApplicationRecord
   validates :account_id, uniqueness: { scope: :list_id }
   validate :validate_relationship
 
-  before_validation :set_follow
+  before_validation :set_follow, unless: :list_owner_account_is_account?
 
   private
 
   def set_follow
-    return if list.account_id == account.id
-
     self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id)
   rescue ActiveRecord::RecordNotFound
     self.follow_request = FollowRequest.find_by!(account_id: list.account_id, target_account_id: account.id)
@@ -39,4 +37,8 @@ class ListAccount < ApplicationRecord
     errors.add(:follow, 'mismatched accounts') if follow_id.present? && follow.target_account_id != account_id
     errors.add(:follow_request, 'mismatched accounts') if follow_request_id.present? && follow_request.target_account_id != account_id
   end
+
+  def list_owner_account_is_account?
+    list.account_id == account_id
+  end
 end
diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb
new file mode 100644
index 0000000000..e5aad2affa
--- /dev/null
+++ b/spec/models/list_account_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ListAccount do
+  describe 'Callbacks to set follows' do
+    context 'when list owner follows account' do
+      let!(:follow) { Fabricate :follow }
+      let(:list) { Fabricate :list, account: follow.account }
+
+      it 'finds and sets the follow with the list account' do
+        list_account = described_class.create list: list, account: follow.target_account
+        expect(list_account)
+          .to have_attributes(
+            follow: eq(follow),
+            follow_request: be_nil
+          )
+      end
+    end
+
+    context 'when list owner has a follow request for account' do
+      let!(:follow_request) { Fabricate :follow_request }
+      let(:list) { Fabricate :list, account: follow_request.account }
+
+      it 'finds and sets the follow request with the list account' do
+        list_account = described_class.create list: list, account: follow_request.target_account
+        expect(list_account)
+          .to have_attributes(
+            follow: be_nil,
+            follow_request: eq(follow_request)
+          )
+      end
+    end
+
+    context 'when list owner is the account' do
+      let(:list) { Fabricate :list  }
+
+      it 'does not set follow or follow request' do
+        list_account = described_class.create list: list, account: list.account
+        expect(list_account)
+          .to have_attributes(
+            follow: be_nil,
+            follow_request: be_nil
+          )
+      end
+    end
+  end
+end

From ba81e4e0192371e1fc07ad6d7cf58e86766d0e77 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 13 Sep 2024 11:11:10 +0200
Subject: [PATCH 56/89] Fix inability to locally suspend remotely-suspended
 accounts in moderation interface (#31899)

---
 app/models/account.rb                         |  4 +++
 app/models/admin/account_action.rb            |  2 +-
 app/views/admin/account_actions/new.html.haml |  2 +-
 app/views/admin/reports/_actions.html.haml    |  6 ++--
 spec/models/account_spec.rb                   | 29 +++++++++++++++++++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 0a2cff2fe8..a4cab99f7b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -259,6 +259,10 @@ class Account < ApplicationRecord
     suspended_at.present? && !instance_actor?
   end
 
+  def suspended_locally?
+    suspended? && suspension_origin_local?
+  end
+
   def suspended_permanently?
     suspended? && deletion_request.nil?
   end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 4be58ba853..7c66b6e646 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -74,7 +74,7 @@ class Admin::AccountAction
     end
 
     def disabled_types_for_account(account)
-      if account.suspended?
+      if account.suspended_locally?
         %w(silence suspend)
       elsif account.silenced?
         %w(silence)
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
index 5b98582d8c..c4311eba96 100644
--- a/app/views/admin/account_actions/new.html.haml
+++ b/app/views/admin/account_actions/new.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('admin.account_actions.title', acct: @account.pretty_acct)
 
-- if @account.suspended?
+- if @account.suspended_locally?
   .flash-message.alert
     = t('admin.account_actions.already_suspended')
 - elsif @account.silenced?
diff --git a/app/views/admin/reports/_actions.html.haml b/app/views/admin/reports/_actions.html.haml
index 7317d401e7..ef016e949b 100644
--- a/app/views/admin/reports/_actions.html.haml
+++ b/app/views/admin/reports/_actions.html.haml
@@ -27,7 +27,7 @@
         = form.button t('admin.accounts.silence'),
                       name: :silence,
                       class: 'button button--destructive',
-                      disabled: report.target_account.silenced? || report.target_account.suspended?,
+                      disabled: report.target_account.silenced? || report.target_account.suspended_locally?,
                       title: report.target_account.silenced? ? t('admin.account_actions.already_silenced') : ''
       .report-actions__item__description
         = t('admin.reports.actions.silence_description_html')
@@ -36,8 +36,8 @@
         = form.button t('admin.accounts.suspend'),
                       name: :suspend,
                       class: 'button button--destructive',
-                      disabled: report.target_account.suspended?,
-                      title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
+                      disabled: report.target_account.suspended_locally?,
+                      title: report.target_account.suspended_locally? ? t('admin.account_actions.already_suspended') : ''
       .report-actions__item__description
         = t('admin.reports.actions.suspend_description_html')
     .report-actions__item
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 2ec7aafc51..e8d761f38b 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -10,10 +10,39 @@ RSpec.describe Account do
 
     let(:bob) { Fabricate(:account, username: 'bob') }
 
+    describe '#suspended_locally?' do
+      context 'when the account is not suspended' do
+        it 'returns false' do
+          expect(subject.suspended_locally?).to be false
+        end
+      end
+
+      context 'when the account is suspended locally' do
+        before do
+          subject.update!(suspended_at: 1.day.ago, suspension_origin: :local)
+        end
+
+        it 'returns true' do
+          expect(subject.suspended_locally?).to be true
+        end
+      end
+
+      context 'when the account is suspended remotely' do
+        before do
+          subject.update!(suspended_at: 1.day.ago, suspension_origin: :remote)
+        end
+
+        it 'returns false' do
+          expect(subject.suspended_locally?).to be false
+        end
+      end
+    end
+
     describe '#suspend!' do
       it 'marks the account as suspended and creates a deletion request' do
         expect { subject.suspend! }
           .to change(subject, :suspended?).from(false).to(true)
+          .and change(subject, :suspended_locally?).from(false).to(true)
           .and(change { AccountDeletionRequest.exists?(account: subject) }.from(false).to(true))
       end
 

From c1b2c4fd9a3ae8110d75794c98fe0833c31ff9cc Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Fri, 13 Sep 2024 13:37:15 +0200
Subject: [PATCH 57/89] Strip protocol from attribution domains (#31900)

---
 .../concerns/account/attribution_domains.rb   |  6 +++-
 spec/models/account_spec.rb                   | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/account/attribution_domains.rb b/app/models/concerns/account/attribution_domains.rb
index 37a498a150..163c2291fe 100644
--- a/app/models/concerns/account/attribution_domains.rb
+++ b/app/models/concerns/account/attribution_domains.rb
@@ -13,7 +13,11 @@ module Account::AttributionDomains
 
   def attribution_domains_as_text=(str)
     self[:attribution_domains] = str.split.filter_map do |line|
-      line.strip.delete_prefix('*.')
+      line
+        .strip
+        .delete_prefix('http://')
+        .delete_prefix('https://')
+        .delete_prefix('*.')
     end
   end
 
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index e8d761f38b..a8f6ed7493 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -792,6 +792,34 @@ RSpec.describe Account do
     end
   end
 
+  describe '#attribution_domains_as_text=' do
+    subject { Fabricate(:account) }
+
+    it 'sets attribution_domains accordingly' do
+      subject.attribution_domains_as_text = "hoge.com\nexample.com"
+
+      expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+    end
+
+    it 'strips leading "*."' do
+      subject.attribution_domains_as_text = "hoge.com\n*.example.com"
+
+      expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+    end
+
+    it 'strips the protocol if present' do
+      subject.attribution_domains_as_text = "http://hoge.com\nhttps://example.com"
+
+      expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+    end
+
+    it 'strips a combination of leading "*." and protocol' do
+      subject.attribution_domains_as_text = "http://*.hoge.com\nhttps://*.example.com"
+
+      expect(subject.attribution_domains).to contain_exactly('hoge.com', 'example.com')
+    end
+  end
+
   describe 'Normalizations' do
     describe 'username' do
       it { is_expected.to normalize(:username).from(" \u3000bob \t \u00a0 \n ").to('bob') }

From 5ba3405be4c1f708f198580b481f822698dab392 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:07:33 +0200
Subject: [PATCH 58/89] Update dependency opentelemetry-instrumentation-pg to
 '~> 0.29.0' (#31897)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c808fa480..4cce095ec5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -111,7 +111,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-http', '~> 0.23.2', require: false
   gem 'opentelemetry-instrumentation-http_client', '~> 0.22.3', require: false
   gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
-  gem 'opentelemetry-instrumentation-pg', '~> 0.28.0', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.29.0', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.24.1', require: false
   gem 'opentelemetry-instrumentation-rails', '~> 0.31.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 206178a530..19e66659bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -502,8 +502,8 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
-    opentelemetry-helpers-sql-obfuscation (0.1.0)
-      opentelemetry-common (~> 0.20)
+    opentelemetry-helpers-sql-obfuscation (0.2.0)
+      opentelemetry-common (~> 0.21)
     opentelemetry-instrumentation-action_mailer (0.1.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
@@ -528,8 +528,9 @@ GEM
     opentelemetry-instrumentation-active_support (0.6.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-base (0.22.3)
+    opentelemetry-instrumentation-base (0.22.6)
       opentelemetry-api (~> 1.0)
+      opentelemetry-common (~> 0.21)
       opentelemetry-registry (~> 0.1)
     opentelemetry-instrumentation-concurrent_ruby (0.21.4)
       opentelemetry-api (~> 1.0)
@@ -549,7 +550,7 @@ GEM
     opentelemetry-instrumentation-net_http (0.22.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.28.0)
+    opentelemetry-instrumentation-pg (0.29.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-helpers-sql-obfuscation
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -991,7 +992,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-http (~> 0.23.2)
   opentelemetry-instrumentation-http_client (~> 0.22.3)
   opentelemetry-instrumentation-net_http (~> 0.22.4)
-  opentelemetry-instrumentation-pg (~> 0.28.0)
+  opentelemetry-instrumentation-pg (~> 0.29.0)
   opentelemetry-instrumentation-rack (~> 0.24.1)
   opentelemetry-instrumentation-rails (~> 0.31.0)
   opentelemetry-instrumentation-redis (~> 0.25.3)

From 4b40d13cb37a465cc334e20d8131070c8a23d268 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 14 Sep 2024 02:16:02 +0200
Subject: [PATCH 59/89] Increase preview card image size limit from 2MB to 8MB
 when using libvips (#31904)

---
 app/models/preview_card.rb       | 2 +-
 spec/models/preview_card_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 5a11351e58..7579178f83 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -39,7 +39,7 @@ class PreviewCard < ApplicationRecord
   include Attachmentable
 
   IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
-  LIMIT = 2.megabytes
+  LIMIT = Rails.configuration.x.use_vips ? 8.megabytes : 2.megabytes
 
   BLURHASH_OPTIONS = {
     x_comp: 4,
diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb
index 2f0ea38ee4..c0bc2b6e0e 100644
--- a/spec/models/preview_card_spec.rb
+++ b/spec/models/preview_card_spec.rb
@@ -3,6 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe PreviewCard do
+  describe 'file size limit', :attachment_processing do
+    it 'is set differently whether vips is enabled or not' do
+      expect(described_class::LIMIT).to eq(Rails.configuration.x.use_vips ? 8.megabytes : 2.megabytes)
+    end
+  end
+
   describe 'validations' do
     describe 'urls' do
       it 'allows http schemes' do

From 0cc05fbb7cf818a0ef95576ba663182d02fdd4c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:50:43 +0200
Subject: [PATCH 60/89] Update dependency i18n to v1.14.6 (#31925)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 19e66659bf..b551512859 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -331,7 +331,7 @@ GEM
     httplog (1.7.0)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.14)
       activesupport (>= 4.0.2)

From 2afaa3b3d48248a057f206ae3a3840622e5b959d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:50:51 +0200
Subject: [PATCH 61/89] Update dependency husky to v9.1.6 (#31923)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 50443c6db9..7731124539 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9535,11 +9535,11 @@ __metadata:
   linkType: hard
 
 "husky@npm:^9.0.11":
-  version: 9.1.5
-  resolution: "husky@npm:9.1.5"
+  version: 9.1.6
+  resolution: "husky@npm:9.1.6"
   bin:
     husky: bin.js
-  checksum: 10c0/f42efb95a026303eb880898760f802d88409780dd72f17781d2dfc302177d4f80b641cf1f1694f53f6d97c536c7397684133d8c8fe4a4426f7460186a7d1c6b8
+  checksum: 10c0/705673db4a247c1febd9c5df5f6a3519106cf0335845027bb50a15fba9b1f542cb2610932ede96fd08008f6d9f49db0f15560509861808b0031cdc0e7c798bac
   languageName: node
   linkType: hard
 

From 9ea270526cc4d8c0d1b5a546d7bc598b2c3a9e93 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:51:13 +0200
Subject: [PATCH 62/89] Update DefinitelyTyped types (non-major) (#31922)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7731124539..5f12dfe932 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3661,12 +3661,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:^29.5.2":
-  version: 29.5.12
-  resolution: "@types/jest@npm:29.5.12"
+  version: 29.5.13
+  resolution: "@types/jest@npm:29.5.13"
   dependencies:
     expect: "npm:^29.0.0"
     pretty-format: "npm:^29.0.0"
-  checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
+  checksum: 10c0/9c31af0b155387b9860908830de63c6b79011d7c87c8b61b39da124e26e55423dd51b006749aafe4f0ef3a065016619a1f93ef4b055157d43727f448e67824b7
   languageName: node
   linkType: hard
 
@@ -3768,13 +3768,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.11.8
-  resolution: "@types/pg@npm:8.11.8"
+  version: 8.11.10
+  resolution: "@types/pg@npm:8.11.10"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^4.0.1"
-  checksum: 10c0/040eb04edda338a13dccee47585b4479549fd54561e1bc3768690545adb8708a089b178e04fab9241935d7bad361314fc57af3ad87b391cfb9dc0895dd049763
+  checksum: 10c0/c8800d0ab2c6424308e6c6b40c73f19583ee1aed758462bd07694844b0a551b5841442205a4ee05207b80109ba502f33f20241b1bd9b4902e713611fb9e08f6c
   languageName: node
   linkType: hard
 

From c24de04f9c828b4b64aee5bb8fa133a88b590b65 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:51:36 +0200
Subject: [PATCH 63/89] Update dependency postcss to v8.4.47 (#31913)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5f12dfe932..a0c1bb7bae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13088,10 +13088,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "picocolors@npm:1.0.1"
-  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "picocolors@npm:1.1.0"
+  checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023
   languageName: node
   linkType: hard
 
@@ -14050,13 +14050,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.41":
-  version: 8.4.45
-  resolution: "postcss@npm:8.4.45"
+  version: 8.4.47
+  resolution: "postcss@npm:8.4.47"
   dependencies:
     nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.0.1"
-    source-map-js: "npm:^1.2.0"
-  checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
+    picocolors: "npm:^1.1.0"
+    source-map-js: "npm:^1.2.1"
+  checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44
   languageName: node
   linkType: hard
 
@@ -15981,10 +15981,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "source-map-js@npm:1.2.0"
-  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "source-map-js@npm:1.2.1"
+  checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
   languageName: node
   linkType: hard
 

From 822e918a56055223be009974d581a8295d60b709 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 16 Sep 2024 03:52:22 -0400
Subject: [PATCH 64/89] Add coverage for `Bookmark` validation and
 reblog/status check callback (#31907)

---
 spec/models/bookmark_spec.rb | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 spec/models/bookmark_spec.rb

diff --git a/spec/models/bookmark_spec.rb b/spec/models/bookmark_spec.rb
new file mode 100644
index 0000000000..e0d91000e7
--- /dev/null
+++ b/spec/models/bookmark_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Bookmark do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:account).required }
+    it { is_expected.to belong_to(:status).required }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :bookmark }
+
+    it { is_expected.to validate_uniqueness_of(:status_id).scoped_to(:account_id) }
+  end
+
+  describe 'Callbacks' do
+    describe 'reblog statuses' do
+      context 'when status is not a reblog' do
+        let(:status) { Fabricate :status }
+
+        it 'keeps status set to assigned value' do
+          bookmark = Fabricate.build :bookmark, status: status
+
+          expect { bookmark.valid? }
+            .to_not change(bookmark, :status)
+        end
+      end
+
+      context 'when status is a reblog' do
+        let(:original) { Fabricate :status }
+        let(:status) { Fabricate :status, reblog: original }
+
+        it 'keeps status set to assigned value' do
+          bookmark = Fabricate.build :bookmark, status: status
+
+          expect { bookmark.valid? }
+            .to change(bookmark, :status).to(original)
+        end
+      end
+    end
+  end
+end

From abd2f5654a5d1b2baa4a210c8175d6ed5e6ff5c5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 16 Sep 2024 03:53:03 -0400
Subject: [PATCH 65/89] Add validation coverage for `CustomEmoji` shortcode
 value (#31906)

---
 app/models/custom_emoji.rb       | 3 ++-
 spec/models/custom_emoji_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 6e788c0c1c..f1423bc2fa 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -25,6 +25,7 @@ class CustomEmoji < ApplicationRecord
   include Attachmentable
 
   LIMIT = 256.kilobytes
+  MINIMUM_SHORTCODE_SIZE = 2
 
   SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
 
@@ -44,7 +45,7 @@ class CustomEmoji < ApplicationRecord
   normalizes :domain, with: ->(domain) { domain.downcase }
 
   validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true, size: { less_than: LIMIT }
-  validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: 2 }
+  validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: MINIMUM_SHORTCODE_SIZE }
 
   scope :local, -> { where(domain: nil) }
   scope :remote, -> { where.not(domain: nil) }
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 87b111441a..f812cf7584 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -84,4 +84,13 @@ RSpec.describe CustomEmoji, :attachment_processing do
       it { is_expected.to normalize(:domain).from(nil).to(nil) }
     end
   end
+
+  describe 'Validations' do
+    subject { Fabricate.build :custom_emoji }
+
+    it { is_expected.to validate_uniqueness_of(:shortcode).scoped_to(:domain) }
+    it { is_expected.to validate_length_of(:shortcode).is_at_least(described_class::MINIMUM_SHORTCODE_SIZE) }
+    it { is_expected.to allow_values('cats').for(:shortcode) }
+    it { is_expected.to_not allow_values('@#$@#$', 'X').for(:shortcode) }
+  end
 end

From bf8b55ce91809874169e5fec889f58962d331977 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 16 Sep 2024 04:29:06 -0400
Subject: [PATCH 66/89] Enable `Rails/Output` in `spec/` dir (#31905)

---
 .rubocop/strict.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.rubocop/strict.yml b/.rubocop/strict.yml
index 2222c6d8b9..c2655a1470 100644
--- a/.rubocop/strict.yml
+++ b/.rubocop/strict.yml
@@ -7,8 +7,13 @@ RSpec/Focus: # Require full spec run on CI
   Exclude: []
 
 Rails/Output: # Remove any `puts` debugging
+  inherit_mode:
+    merge:
+      - Include
   Enabled: true
   Exclude: []
+  Include:
+    - spec/**/*.rb
 
 Rails/FindEach: # Using `each` could impact performance, use `find_each`
   Enabled: true

From 1d58f93670a057ce7a4cf757585d4f0b6fd79a0f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 10:48:13 +0200
Subject: [PATCH 67/89] Update dependencies omniauth-saml, ruby-xml and
 ruby-saml (#31926)

---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b551512859..4a139155f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,9 +472,9 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth-saml (2.1.0)
-      omniauth (~> 2.0)
-      ruby-saml (~> 1.12)
+    omniauth-saml (2.2.1)
+      omniauth (~> 2.1)
+      ruby-saml (~> 1.17)
     omniauth_openid_connect (0.6.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
@@ -764,7 +764,7 @@ GEM
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.16.0)
+    ruby-saml (1.17.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby-vips (2.2.2)

From 474abf3c7f38803fe826ccb69afd44511739a256 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:48:20 +0200
Subject: [PATCH 68/89] New Crowdin Translations (automated) (#31911)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ca.json    |  1 +
 app/javascript/mastodon/locales/en-GB.json |  1 +
 app/javascript/mastodon/locales/es-AR.json |  1 +
 app/javascript/mastodon/locales/es-MX.json |  3 +-
 app/javascript/mastodon/locales/es.json    |  3 +-
 app/javascript/mastodon/locales/et.json    |  4 +
 app/javascript/mastodon/locales/eu.json    |  4 +
 app/javascript/mastodon/locales/fo.json    |  1 +
 app/javascript/mastodon/locales/fr-CA.json |  3 +
 app/javascript/mastodon/locales/fr.json    |  3 +
 app/javascript/mastodon/locales/ga.json    |  4 +
 app/javascript/mastodon/locales/gd.json    |  4 +
 app/javascript/mastodon/locales/ia.json    |  1 +
 app/javascript/mastodon/locales/is.json    |  1 +
 app/javascript/mastodon/locales/pt-PT.json | 37 +++++++++
 app/javascript/mastodon/locales/th.json    |  4 +
 app/javascript/mastodon/locales/vi.json    |  4 +
 config/locales/activerecord.et.yml         |  6 ++
 config/locales/activerecord.fr-CA.yml      |  3 +
 config/locales/activerecord.fr.yml         |  3 +
 config/locales/activerecord.ga.yml         |  6 ++
 config/locales/activerecord.gd.yml         |  6 ++
 config/locales/activerecord.ro.yml         | 12 ++-
 config/locales/activerecord.th.yml         |  6 ++
 config/locales/activerecord.vi.yml         |  6 ++
 config/locales/devise.lv.yml               |  8 +-
 config/locales/devise.ro.yml               | 88 +++++++++++-----------
 config/locales/doorkeeper.ro.yml           | 56 +++++++-------
 config/locales/es-MX.yml                   |  8 +-
 config/locales/es.yml                      |  8 +-
 config/locales/et.yml                      | 40 ++++++++++
 config/locales/fr-CA.yml                   | 25 +++++-
 config/locales/fr.yml                      | 25 +++++-
 config/locales/ga.yml                      |  8 ++
 config/locales/gd.yml                      |  8 ++
 config/locales/lt.yml                      | 29 +++++--
 config/locales/lv.yml                      |  7 +-
 config/locales/pt-PT.yml                   | 43 +++++++++++
 config/locales/simple_form.et.yml          |  2 +
 config/locales/simple_form.fr-CA.yml       |  2 +
 config/locales/simple_form.fr.yml          |  2 +
 config/locales/simple_form.ga.yml          |  2 +
 config/locales/simple_form.gd.yml          |  2 +
 config/locales/simple_form.lt.yml          |  2 +
 config/locales/simple_form.lv.yml          |  7 ++
 config/locales/simple_form.th.yml          |  2 +
 config/locales/simple_form.vi.yml          |  2 +
 config/locales/th.yml                      |  8 ++
 config/locales/vi.yml                      |  8 ++
 49 files changed, 420 insertions(+), 99 deletions(-)

diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index d0ee437af9..a637889503 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -789,6 +789,7 @@
   "status.edit": "Edita",
   "status.edited": "Darrera edició {date}",
   "status.edited_x_times": "Editat {count, plural, one {{count} vegada} other {{count} vegades}}",
+  "status.embed": "Obté el codi encastat",
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index a40353a739..d182cf6fe8 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -789,6 +789,7 @@
   "status.edit": "Edit",
   "status.edited": "Last edited {date}",
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Get embed code",
   "status.favourite": "Favourite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 65eab7f437..9618616165 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -789,6 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edición: {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
+  "status.embed": "Obtener código para insertar",
   "status.favourite": "Marcar como favorito",
   "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index ae9658cd90..14afd1e108 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -376,7 +376,7 @@
   "ignore_notifications_modal.ignore": "Ignorar notificaciones",
   "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
-  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te sigue?",
+  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
@@ -789,6 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} time} other {{count} veces}}",
+  "status.embed": "Obtener código para incrustar",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 61a958ed38..c9f050b9de 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -376,7 +376,7 @@
   "ignore_notifications_modal.ignore": "Ignorar notificaciones",
   "ignore_notifications_modal.limited_accounts_title": "¿Ignorar notificaciones de cuentas moderadas?",
   "ignore_notifications_modal.new_accounts_title": "¿Ignorar notificaciones de cuentas nuevas?",
-  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te sigue?",
+  "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
@@ -789,6 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
+  "status.embed": "Obtener código para incrustar",
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 93c2cefb47..d202fb61a4 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Sinu nimekirjad",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laadimine…",
+  "media_gallery.hide": "Peida",
   "moved_to_account_banner.text": "Kontot {disabledAccount} ei ole praegu võimalik kasutada, sest kolisid kontole {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Peida teavituste hulgast",
   "mute_modal.hide_options": "Peida valikud",
@@ -779,6 +780,7 @@
   "status.bookmark": "Järjehoidja",
   "status.cancel_reblog_private": "Lõpeta jagamine",
   "status.cannot_reblog": "Seda postitust ei saa jagada",
+  "status.continued_thread": "Jätkatud lõim",
   "status.copy": "Kopeeri postituse link",
   "status.delete": "Kustuta",
   "status.detailed_status": "Detailne vestluskuva",
@@ -787,6 +789,7 @@
   "status.edit": "Muuda",
   "status.edited": "Viimati muudetud {date}",
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
+  "status.embed": "Hangi manustamiskood",
   "status.favourite": "Lemmik",
   "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
@@ -811,6 +814,7 @@
   "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
+  "status.replied_in_thread": "Vastatud lõimes",
   "status.replied_to": "Vastas kasutajale {name}",
   "status.reply": "Vasta",
   "status.replyAll": "Vasta lõimele",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 2248ffbf9d..989a328d0a 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Zure zerrendak",
   "load_pending": "{count, plural, one {elementu berri #} other {# elementu berri}}",
   "loading_indicator.label": "Kargatzen…",
+  "media_gallery.hide": "Ezkutatu",
   "moved_to_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan, {movedToAccount} kontura aldatu zinelako.",
   "mute_modal.hide_from_notifications": "Ezkutatu jakinarazpenetatik",
   "mute_modal.hide_options": "Ezkutatu aukerak",
@@ -775,6 +776,7 @@
   "status.bookmark": "Laster-marka",
   "status.cancel_reblog_private": "Kendu bultzada",
   "status.cannot_reblog": "Bidalketa honi ezin zaio bultzada eman",
+  "status.continued_thread": "Harian jarraitu zuen",
   "status.copy": "Kopiatu bidalketaren esteka",
   "status.delete": "Ezabatu",
   "status.detailed_status": "Elkarrizketaren ikuspegi xehetsua",
@@ -783,6 +785,7 @@
   "status.edit": "Editatu",
   "status.edited": "Azken edizioa: {date}",
   "status.edited_x_times": "{count, plural, one {behin} other {{count} aldiz}} editatua",
+  "status.embed": "Lortu txertatzeko kodea",
   "status.favourite": "Gogokoa",
   "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
@@ -807,6 +810,7 @@
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.remove_bookmark": "Kendu laster-marka",
+  "status.replied_in_thread": "Harian erantzun zuen",
   "status.replied_to": "{name} erabiltzaileari erantzuna",
   "status.reply": "Erantzun",
   "status.replyAll": "Erantzun harian",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 73c64b1b82..9dd8feaf2f 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -789,6 +789,7 @@
   "status.edit": "Rætta",
   "status.edited": "Seinast broytt {date}",
   "status.edited_x_times": "Rættað {count, plural, one {{count} ferð} other {{count} ferð}}",
+  "status.embed": "Fá kodu at seta inn",
   "status.favourite": "Dámdur postur",
   "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 96ae81c58a..f58e3b81e4 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -36,6 +36,7 @@
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
   "account.following": "Abonné·e",
+  "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
   "account.go_to_profile": "Voir ce profil",
   "account.hide_reblogs": "Masquer les boosts de @{name}",
@@ -788,6 +789,7 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifiée {count, plural, one {{count} fois} other {{count} fois}}",
+  "status.embed": "Obtenir le code d'intégration",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
@@ -812,6 +814,7 @@
   "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des signets",
+  "status.replied_in_thread": "A répondu dans un fil de discussion",
   "status.replied_to": "A répondu à {name}",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre à cette discussion",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fb0bfac29d..175601eb27 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -36,6 +36,7 @@
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
   "account.following": "Abonnements",
+  "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.go_to_profile": "Aller au profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
@@ -788,6 +789,7 @@
   "status.edit": "Modifier",
   "status.edited": "Dernière modification le {date}",
   "status.edited_x_times": "Modifié {count, plural, one {{count} fois} other {{count} fois}}",
+  "status.embed": "Obtenir le code d'intégration",
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
@@ -812,6 +814,7 @@
   "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des marque-pages",
+  "status.replied_in_thread": "A répondu dans un fil de discussion",
   "status.replied_to": "En réponse à {name}",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 794a433cd2..29d4f574c0 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Do liostaí",
   "load_pending": "{count, plural, one {# mír nua} two {# mír nua} few {# mír nua} many {# mír nua} other {# mír nua}}",
   "loading_indicator.label": "Á lódáil…",
+  "media_gallery.hide": "Folaigh",
   "moved_to_account_banner.text": "Tá do chuntas {disabledAccount} díchumasaithe faoi láthair toisc gur bhog tú go {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Folaigh ó fhógraí",
   "mute_modal.hide_options": "Folaigh roghanna",
@@ -779,6 +780,7 @@
   "status.bookmark": "Leabharmharcanna",
   "status.cancel_reblog_private": "Dímhol",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
+  "status.continued_thread": "Snáithe ar lean",
   "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",
   "status.detailed_status": "Amharc comhrá mionsonraithe",
@@ -787,6 +789,7 @@
   "status.edit": "Cuir in eagar",
   "status.edited": "Arna chuir in eagar anuas {date}",
   "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
+  "status.embed": "Faigh cód leabú",
   "status.favourite": "Is fearr leat",
   "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",
@@ -811,6 +814,7 @@
   "status.reblogs.empty": "Níor mhol éinne an phostáil seo fós. Nuair a mholfaidh duine éigin í, taispeánfar anseo é sin.",
   "status.redraft": "Scrios ⁊ athdhréachtaigh",
   "status.remove_bookmark": "Bain leabharmharc",
+  "status.replied_in_thread": "D'fhreagair sa snáithe",
   "status.replied_to": "D'fhreagair {name}",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair le snáithe",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 3f1b353e75..76eb0c26b5 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Na liostaichean agad",
   "load_pending": "{count, plural, one {# nì ùr} two {# nì ùr} few {# nithean ùra} other {# nì ùr}}",
   "loading_indicator.label": "’Ga luchdadh…",
+  "media_gallery.hide": "Falaich",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Falaich o na brathan",
   "mute_modal.hide_options": "Roghainnean falaich",
@@ -779,6 +780,7 @@
   "status.bookmark": "Cuir ris na comharran-lìn",
   "status.cancel_reblog_private": "Na brosnaich tuilleadh",
   "status.cannot_reblog": "Cha ghabh am post seo brosnachadh",
+  "status.continued_thread": "Pàirt de shnàithlean",
   "status.copy": "Dèan lethbhreac dhen cheangal dhan phost",
   "status.delete": "Sguab às",
   "status.detailed_status": "Mion-shealladh a’ chòmhraidh",
@@ -787,6 +789,7 @@
   "status.edit": "Deasaich",
   "status.edited": "An deasachadh mu dheireadh {date}",
   "status.edited_x_times": "Chaidh a dheasachadh {count, plural, one {{count} turas} two {{count} thuras} few {{count} tursan} other {{count} turas}}",
+  "status.embed": "Faigh còd leabachaidh",
   "status.favourite": "Cuir ris na h-annsachdan",
   "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
@@ -811,6 +814,7 @@
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
+  "status.replied_in_thread": "Freagairt do shnàithlean",
   "status.replied_to": "Air {name} fhreagairt",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair dhan t-snàithlean",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index e301363f27..8cfe2ecac0 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -355,6 +355,7 @@
   "hints.profiles.see_more_followers": "Vider plus de sequitores sur {domain}",
   "hints.profiles.see_more_follows": "Vider plus de sequites sur {domain}",
   "hints.profiles.see_more_posts": "Vider plus de messages sur {domain}",
+  "hints.threads.replies_may_be_missing": "Responsas de altere servitores pote esser perdite.",
   "hints.threads.see_more": "Vider plus de responsas sur {domain}",
   "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index ba362afc8a..dc0b563f1f 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -789,6 +789,7 @@
   "status.edit": "Breyta",
   "status.edited": "Síðast breytt {date}",
   "status.edited_x_times": "Breytt {count, plural, one {{count} sinni} other {{count} sinnum}}",
+  "status.embed": "Ná í innfellanlegan kóða",
   "status.favourite": "Eftirlæti",
   "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 1dc4bc5109..dd70e809a3 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -371,6 +371,14 @@
   "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar utilizadores que ignoraste as notificações deles. Ignorar notificações não irá parar as mensagens serem enviadas.",
   "ignore_notifications_modal.filter_instead": "Filtrar em vez disso",
   "ignore_notifications_modal.filter_to_act_users": "Ainda poderá aceitar, rejeitar, ou reportar utilizadores",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "A filtragem ajuda a evitar potenciais equívocos",
+  "ignore_notifications_modal.filter_to_review_separately": "Pode rever as notificações filtradas separadamente",
+  "ignore_notifications_modal.ignore": "Ignorar notificações",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorar notificações de contas moderadas?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorar notificações de contas novas?",
+  "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não o seguem?",
+  "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que não segue?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de Menções Privadas não solicitadas?",
   "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar assinalar esta publicação como favorita para que o autor saiba que gostou e guardá-la para mais tarde.",
   "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
@@ -449,6 +457,7 @@
   "lists.subheading": "As tuas listas",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
   "loading_indicator.label": "A carregar…",
+  "media_gallery.hide": "Esconder",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar das notificações",
   "mute_modal.hide_options": "Ocultar opções",
@@ -460,6 +469,7 @@
   "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
+  "navigation_bar.administration": "Administração",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
@@ -476,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Seguindo e seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
+  "navigation_bar.moderation": "Moderação",
   "navigation_bar.mutes": "Utilizadores silenciados",
   "navigation_bar.opened_in_classic_interface": "Por norma, publicações, contas, e outras páginas específicas são abertas na interface web clássica.",
   "navigation_bar.personal": "Pessoal",
@@ -491,9 +502,13 @@
   "notification.admin.report_statuses": "{name} denunicou {target} por {category}",
   "notification.admin.report_statuses_other": "{name} denunciou {target}",
   "notification.admin.sign_up": "{name} inscreveu-se",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} inscreveram-se",
   "notification.favourite": "{name} assinalou a sua publicação como favorita",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> assinalou a sua publicação como favorita",
   "notification.follow": "{name} começou a seguir-te",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} começaram a segui-lo",
   "notification.follow_request": "{name} pediu para segui-lo",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} pediram para segui-lo",
   "notification.label.mention": "Menção",
   "notification.label.private_mention": "Menção privada",
   "notification.label.private_reply": "Resposta privada",
@@ -511,6 +526,7 @@
   "notification.own_poll": "A sua sondagem terminou",
   "notification.poll": "Terminou uma sondagem em que votou",
   "notification.reblog": "{name} reforçou a tua publicação",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> reforçaram a sua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
   "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
@@ -519,13 +535,24 @@
   "notification.status": "{name} acabou de publicar",
   "notification.update": "{name} editou uma publicação",
   "notification_requests.accept": "Aceitar",
+  "notification_requests.accept_multiple": "{count, plural, one {Aceitar # pedidos…} other {Aceitar # pedidos…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceitar pedido} other {Aceitar pedidos}}",
+  "notification_requests.confirm_accept_multiple.message": "Está prestes a aceitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Tem a certeza de que pretende continuar?",
+  "notification_requests.confirm_accept_multiple.title": "Aceitar pedidos de notificação?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Rejeitar pedido} other {Rejeitar pedidos}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Está prestes a rejeitar {count, plural, one {um pedido de notificação} other {# pedidos de notificação}}. Não será fácil voltar a {count, plural, one {aceder-lhe} other {aceder-lhes}}. Tem a certeza de que pretende continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "Rejeitar pedidos de notificação?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rejeitar # pedido…} other {Rejeitar # pedidos…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Concluído",
   "notification_requests.explainer_for_limited_account": "As notificações desta conta foram filtradas porque a conta foi limitada por um moderador.",
   "notification_requests.explainer_for_limited_remote_account": "As notificações desta conta foram filtradas porque a conta ou o seu servidor foram limitados por um moderador.",
   "notification_requests.maximize": "Maximizar",
   "notification_requests.minimize_banner": "Minimizar o cabeçalho das notificações filtradas",
   "notification_requests.notifications_from": "Notificações de {name}",
   "notification_requests.title": "Notificações filtradas",
+  "notification_requests.view": "Ver notificações",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?",
   "notifications.clear_title": "Limpar notificações?",
@@ -562,6 +589,12 @@
   "notifications.permission_denied": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão, solicitada pelo navegador, foi recusada anteriormente",
   "notifications.permission_denied_alert": "Notificações no ambiente de trabalho não podem ser ativadas, pois a permissão do navegador foi recusada anteriormente",
   "notifications.permission_required": "Notificações no ambiente de trabalho não estão disponíveis porque a permissão necessária não foi concedida.",
+  "notifications.policy.accept": "Aceitar",
+  "notifications.policy.accept_hint": "Mostrar nas notificações",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Enviar para o vazio, para nunca mais ser visto",
+  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter_hint": "Enviar para a caixa de notificações filtradas",
   "notifications.policy.filter_limited_accounts_hint": "Limitado pelos moderadores do servidor",
   "notifications.policy.filter_limited_accounts_title": "Contas moderadas",
   "notifications.policy.filter_new_accounts.hint": "Criada nos últimos {days, plural, one {um dia} other {# dias}}",
@@ -572,6 +605,7 @@
   "notifications.policy.filter_not_following_title": "Pessoas que você não segue",
   "notifications.policy.filter_private_mentions_hint": "Filtrado, a menos que seja em resposta à sua própria menção ou se você seguir o remetente",
   "notifications.policy.filter_private_mentions_title": "Menções privadas não solicitadas",
+  "notifications.policy.title": "Gerir notificações de…",
   "notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca perca nada",
@@ -746,6 +780,7 @@
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Deixar de reforçar",
   "status.cannot_reblog": "Não é possível partilhar esta publicação",
+  "status.continued_thread": "Continuação da conserva",
   "status.copy": "Copiar hiperligação para a publicação",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista pormenorizada da conversa",
@@ -754,6 +789,7 @@
   "status.edit": "Editar",
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural,one {{count} vez} other {{count} vezes}}",
+  "status.embed": "Obter código de incorporação",
   "status.favourite": "Assinalar como favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
@@ -778,6 +814,7 @@
   "status.reblogs.empty": "Ainda ninguém reforçou esta publicação. Quando alguém o fizer, ele irá aparecer aqui.",
   "status.redraft": "Apagar & reescrever",
   "status.remove_bookmark": "Retirar dos marcadores",
+  "status.replied_in_thread": "Responder na conversa",
   "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index b8c942f999..69651df82c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -457,6 +457,7 @@
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด…",
+  "media_gallery.hide": "ซ่อน",
   "moved_to_account_banner.text": "มีการปิดใช้งานบัญชีของคุณ {disabledAccount} ในปัจจุบันเนื่องจากคุณได้ย้ายไปยัง {movedToAccount}",
   "mute_modal.hide_from_notifications": "ซ่อนจากการแจ้งเตือน",
   "mute_modal.hide_options": "ซ่อนตัวเลือก",
@@ -779,6 +780,7 @@
   "status.bookmark": "เพิ่มที่คั่นหน้า",
   "status.cancel_reblog_private": "เลิกดัน",
   "status.cannot_reblog": "ไม่สามารถดันโพสต์นี้",
+  "status.continued_thread": "กระทู้ต่อเนื่อง",
   "status.copy": "คัดลอกลิงก์ไปยังโพสต์",
   "status.delete": "ลบ",
   "status.detailed_status": "มุมมองการสนทนาโดยละเอียด",
@@ -787,6 +789,7 @@
   "status.edit": "แก้ไข",
   "status.edited": "แก้ไขล่าสุดเมื่อ {date}",
   "status.edited_x_times": "แก้ไข {count, plural, other {{count} ครั้ง}}",
+  "status.embed": "รับโค้ดฝังตัว",
   "status.favourite": "ชื่นชอบ",
   "status.favourites": "{count, plural, other {รายการโปรด}}",
   "status.filter": "กรองโพสต์นี้",
@@ -811,6 +814,7 @@
   "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
   "status.redraft": "ลบแล้วร่างใหม่",
   "status.remove_bookmark": "เอาที่คั่นหน้าออก",
+  "status.replied_in_thread": "ตอบกลับในกระทู้",
   "status.replied_to": "ตอบกลับ {name}",
   "status.reply": "ตอบกลับ",
   "status.replyAll": "ตอบกลับกระทู้",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 449435847e..08fc44d83d 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -457,6 +457,7 @@
   "lists.subheading": "Danh sách của bạn",
   "load_pending": "{count, plural, one {# tút mới} other {# tút mới}}",
   "loading_indicator.label": "Đang tải…",
+  "media_gallery.hide": "Ẩn",
   "moved_to_account_banner.text": "Tài khoản {disabledAccount} của bạn hiện không khả dụng vì bạn đã chuyển sang {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ẩn thông báo",
   "mute_modal.hide_options": "Tùy chọn ẩn",
@@ -779,6 +780,7 @@
   "status.bookmark": "Lưu",
   "status.cancel_reblog_private": "Hủy đăng lại",
   "status.cannot_reblog": "Không thể đăng lại tút này",
+  "status.continued_thread": "Tiếp tục trong chủ đề",
   "status.copy": "Sao chép URL",
   "status.delete": "Xóa",
   "status.detailed_status": "Xem chi tiết thêm",
@@ -787,6 +789,7 @@
   "status.edit": "Sửa",
   "status.edited": "Sửa lần cuối {date}",
   "status.edited_x_times": "Đã sửa {count, plural, other {{count} lần}}",
+  "status.embed": "Lấy mã nhúng",
   "status.favourite": "Thích",
   "status.favourites": "{count, plural, other {lượt thích}}",
   "status.filter": "Lọc tút này",
@@ -811,6 +814,7 @@
   "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
   "status.redraft": "Xóa và viết lại",
   "status.remove_bookmark": "Bỏ lưu",
+  "status.replied_in_thread": "Trả lời trong chủ đề",
   "status.replied_to": "Trả lời {name}",
   "status.reply": "Trả lời",
   "status.replyAll": "Trả lời",
diff --git a/config/locales/activerecord.et.yml b/config/locales/activerecord.et.yml
index 8cabf0e0fe..7af2c362db 100644
--- a/config/locales/activerecord.et.yml
+++ b/config/locales/activerecord.et.yml
@@ -15,6 +15,12 @@ et:
       user/invite_request:
         text: Põhjus
     errors:
+      attributes:
+        domain:
+          invalid: pole kehtiv domeeninimi
+      messages:
+        invalid_domain_on_line: "%{value} ei ole kehtiv domeeninimi"
+        too_many_lines: on üle limiidi %{limit} rida
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fr-CA.yml b/config/locales/activerecord.fr-CA.yml
index b6f005d220..8deeeee015 100644
--- a/config/locales/activerecord.fr-CA.yml
+++ b/config/locales/activerecord.fr-CA.yml
@@ -18,6 +18,9 @@ fr-CA:
       attributes:
         domain:
           invalid: n'est pas un nom de domaine valide
+      messages:
+        invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide"
+        too_many_lines: dépasse la limite de %{limit} lignes
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
index 05eb7ce67b..2f74b16d53 100644
--- a/config/locales/activerecord.fr.yml
+++ b/config/locales/activerecord.fr.yml
@@ -18,6 +18,9 @@ fr:
       attributes:
         domain:
           invalid: n'est pas un nom de domaine valide
+      messages:
+        invalid_domain_on_line: "%{value} n'est pas un nom de domaine valide"
+        too_many_lines: dépasse la limite de %{limit} lignes
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.ga.yml b/config/locales/activerecord.ga.yml
index 1b61edb2e2..4f83bc40aa 100644
--- a/config/locales/activerecord.ga.yml
+++ b/config/locales/activerecord.ga.yml
@@ -15,6 +15,12 @@ ga:
       user/invite_request:
         text: Fáth
     errors:
+      attributes:
+        domain:
+          invalid: nach ainm fearainn bailí é
+      messages:
+        invalid_domain_on_line: Ní ainm fearainn bailí é %{value}
+        too_many_lines: thar an teorainn de %{limit} línte
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.gd.yml b/config/locales/activerecord.gd.yml
index 895f035c03..26848e2584 100644
--- a/config/locales/activerecord.gd.yml
+++ b/config/locales/activerecord.gd.yml
@@ -15,6 +15,12 @@ gd:
       user/invite_request:
         text: Adhbhar
     errors:
+      attributes:
+        domain:
+          invalid: "– chan eil seo ’na ainm àrainne dligheach"
+      messages:
+        invalid_domain_on_line: Chan eil %{value} ’na ainm àrainne dligheach
+        too_many_lines: "– tha seo thar crìoch de %{limit} nan loidhnichean"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.ro.yml b/config/locales/activerecord.ro.yml
index 83c90eda29..1adec0b149 100644
--- a/config/locales/activerecord.ro.yml
+++ b/config/locales/activerecord.ro.yml
@@ -11,15 +11,21 @@ ro:
         locale: Localizare
         password: Parolă
       user/account:
-        username: Nume utilizator
+        username: Nume de utilizator
       user/invite_request:
         text: Motiv
     errors:
+      attributes:
+        domain:
+          invalid: nu este un nume de domeniu valid
+      messages:
+        invalid_domain_on_line: "%{value} nu este un nume de domeniu valid"
+        too_many_lines: este peste limita de %{limit} linii
       models:
         account:
           attributes:
             username:
-              invalid: doar litere, numere și sublinieri
+              invalid: trebuie să conțină numai litere, cifre și bară jos (_)
               reserved: este rezervat
         admin/webhook:
           attributes:
@@ -56,4 +62,4 @@ ro:
         webhook:
           attributes:
             events:
-              invalid_permissions: nu poate include evenimente la care nu aveți drepturi
+              invalid_permissions: nu poate include evenimente la care nu aveți dreptul
diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml
index 3b4b57a236..e1021b8afa 100644
--- a/config/locales/activerecord.th.yml
+++ b/config/locales/activerecord.th.yml
@@ -15,6 +15,12 @@ th:
       user/invite_request:
         text: เหตุผล
     errors:
+      attributes:
+        domain:
+          invalid: ไม่ใช่ชื่อโดเมนที่ถูกต้อง
+      messages:
+        invalid_domain_on_line: "%{value} ไม่ใช่ชื่อโดเมนที่ถูกต้อง"
+        too_many_lines: เกินขีดจำกัด %{limit} บรรทัด
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.vi.yml b/config/locales/activerecord.vi.yml
index 1b4ad0a4d2..b48510c2e2 100644
--- a/config/locales/activerecord.vi.yml
+++ b/config/locales/activerecord.vi.yml
@@ -15,6 +15,12 @@ vi:
       user/invite_request:
         text: Lý do
     errors:
+      attributes:
+        domain:
+          invalid: không phải là một tên miền hợp lệ
+      messages:
+        invalid_domain_on_line: "%{value} không phải là một tên miền hợp lệ"
+        too_many_lines: vượt quá giới hạn %{limit} dòng
       models:
         account:
           attributes:
diff --git a/config/locales/devise.lv.yml b/config/locales/devise.lv.yml
index 94b4774b60..4470c8109e 100644
--- a/config/locales/devise.lv.yml
+++ b/config/locales/devise.lv.yml
@@ -14,9 +14,9 @@ lv:
       not_found_in_database: Nederīga %{authentication_keys} vai parole.
       omniauth_user_creation_failure: Kļūda šīs identitātes konta izveidošanā.
       pending: Tavs konts joprojām tiek pārskatīts.
-      timeout: Tava sesija ir beigusies. Lūdzu, pieraksties vēlreiz, lai turpinātu.
-      unauthenticated: Lai turpinātu, tev ir jāpierakstās vai jāreģistrējas.
-      unconfirmed: Lai turpinātu, tev ir jāapstiprina savu e-pasta adresi.
+      timeout: Sesijair beigusies. Lūgums vēlreiz pieteikties, lai turpinātu.
+      unauthenticated: Lai turpinātu, jāpiesakās vai jāreģistrējas.
+      unconfirmed: Lai turpinātu, jāapliecina sava e-pasta adrese.
     mailer:
       confirmation_instructions:
         action: Apstiprini savu e-pasta adresi
@@ -108,7 +108,7 @@ lv:
     unlocks:
       send_instructions: Pēc dažām minūtēm tu saņemsi e-pastu ar norādījumiem, kā atbloķēt savu kontu. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
       send_paranoid_instructions: Ja tavs konts eksistē, dažu minūšu laikā tu saņemsi e-pastu ar norādījumiem, kā to atbloķēt. Lūdzu, pārbaudi spama mapi, ja neesi saņēmis šo e-pastu.
-      unlocked: Tavs konts ir veiksmīgi atbloķēts. Lūdzu, pieraksties, lai turpinātu.
+      unlocked: Konts tika veiksmīgi atbloķēts. Lūgums pieteikties, lai turpinātu.
   errors:
     messages:
       already_confirmed: jau tika apstiprināts, lūdzu, mēģini pierakstīties
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index 40cb6a7581..f570f77e1d 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -2,58 +2,58 @@
 ro:
   devise:
     confirmations:
-      confirmed: Adresa ta de e-mail a fost confirmată cu succes.
-      send_instructions: Vei primi un e-mail cu instrucțiuni despre cum să confirmi adresa ta de e-mail în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
-      send_paranoid_instructions: Dacă adresa ta de e-mail există în baza noastră de date, în câteva minute vei primi un e-mail cu instrucțiuni pentru confirmarea adresei tale de e-mail. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
+      confirmed: Adresa dvs. de e-mail a fost confirmată cu succes.
+      send_instructions: Veți primi un e-mail în câteva minute cu instrucțiuni despre cum să vă confirmați adresa de e-mail. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
+      send_paranoid_instructions: Dacă adresa dvs. de e-mail există în baza noastră de date, veți primi în câteva minute un e-mail cu instrucțiuni pentru confirmarea adresei de e-mail. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
     failure:
-      already_authenticated: Ești deja conectat.
-      inactive: Contul tău nu este încă activat.
+      already_authenticated: Sunteți deja conectat.
+      inactive: Contul dvs. nu este încă activat.
       invalid: "%{authentication_keys} sau parolă greșită."
-      last_attempt: Mai ai încă o încercare înainte ca contul tău să fie blocat.
-      locked: Contul tău este blocat.
+      last_attempt: Mai aveți o încercare înainte ca contul dvs. să fie blocat.
+      locked: Contul dvs. este blocat.
       not_found_in_database: "%{authentication_keys} sau parolă greșită."
       omniauth_user_creation_failure: Eroare la crearea unui cont pentru această identitate.
-      pending: Contul tău este încă în curs de revizuire.
-      timeout: Sesiunea ta a expirat. Te rugăm să te conectezi din nou pentru a continua.
-      unauthenticated: Trebuie să te conectezi sau să te înregistrezi înainte de a continua.
-      unconfirmed: Trebuie să confirmi adresa ta de e-mail înainte de a continua.
+      pending: Contul dvs. este încă în curs de revizuire.
+      timeout: Sesiunea dvs. a expirat. Vă rugăm să vă conectați din nou pentru a continua.
+      unauthenticated: Trebuie să vă conectați sau să vă înregistrați înainte de a continua.
+      unconfirmed: Trebuie să vă confirmați adresa de e-mail înainte de a continua.
     mailer:
       confirmation_instructions:
-        action: Verifică adresa de e-mail
+        action: Verificare adresă de e-mail
         action_with_app: Confirmați și reveniți la %{app}
-        explanation: Ai creat un cont pe %{host} cu această adresă de e-mail. Ești la un clic distanță de a-l activa. Dacă nu ai fost tu, ignoră acest e-mail.
-        explanation_when_pending: Ai solicitat o invitație către %{host} cu această adresă de e-mail. Odată ce îți confirmi adresa de e-mail, îți vom revizui cererea. Te poți autentifica pentru a-ți schimba detaliile sau pentru a-ți șterge contul, dar nu poți accesa majoritatea funcțiilor până când contul tău nu este aprobat. Dacă cererea ta este respinsă, datele tale vor fi șterse, astfel încât nu va fi necesară nicio altă acțiune din partea ta. Dacă nu ai fost tu, ignoră acest e-mail.
+        explanation: Ați creat un cont pe %{host} cu această adresă de e-mail. Sunteți la un clic distanță de a-l activa. Dacă nu ați fost dvs., vă rugăm să ignorați acest e-mail.
+        explanation_when_pending: Ați aplicat pentru o invitație pentru %{host} cu această adresă de e-mail. Odată ce vă confirmați adresa de e-mail, vă vom examina cererea. Vă puteți autentifica pentru a vă schimba detaliile sau pentru a vă șterge contul, dar nu puteți accesa majoritatea funcțiilor până când contul dvs. nu este aprobat. Dacă cererea dvs. este respinsă, datele dvs. vor fi șterse, astfel încât nu va fi necesară nicio acțiune suplimentară din partea dvs. Dacă nu ați fost dvs., vă rugăm să ignorați acest e-mail.
         extra_html: Te rugăm să verifici și <a href="%{terms_path}">regulile serverului</a> și <a href="%{policy_path}">termenii noștri de serviciu</a>.
         subject: 'Mastodon: Instrucțiuni de confirmare pentru %{instance}'
-        title: Verifică adresa de e-mail
+        title: Verificați adresa de e-mail
       email_changed:
-        explanation: 'Adresa de e-mail pentru contul tău este schimbată la:'
-        extra: Dacă nu v-ați schimbat adresa de e-mail, probabil că cineva a obținut acces la contul dvs. Te rugăm să îți schimbi parola imediat sau să contactezi administratorul serverului dacă nu ai acces la contul tău.
-        subject: 'Mastodon: E-mail schimbat'
-        title: Noua adresa de e-mail
+        explanation: 'Adresa de e-mail a contului dvs. este schimbată în:'
+        extra: Dacă nu v-ați schimbat adresa de e-mail, probabil că cineva a obținut acces la contul dvs. Vă rugăm să vă schimbați parola imediat sau să contactați administratorul serverului dacă nu aveți acces la contul dvs.
+        subject: 'Mastodon: Adresă de e-mail schimbată'
+        title: Adresă de e-mail nouă
       password_change:
-        explanation: Parola contului tău a fost schimbată.
-        extra: Dacă nu v-ați schimbat parola, este posibil ca cineva să fi obținut acces la contul dvs. Te rugăm să îți schimbi parola imediat sau să contactezi administratorul serverului dacă nu ai acces la contul tău.
+        explanation: Parola pentru contul dvs. a fost schimbată.
+        extra: Dacă nu v-ați schimbat parola, probabil că cineva a obținut acces la contul dvs. Vă rugăm să vă schimbați parola imediat sau să contactați administratorul serverului dacă nu aveți acces la contul dvs.
         subject: 'Mastodon: Parolă schimbată'
         title: Parolă schimbată
       reconfirmation_instructions:
-        explanation: Confirmă noua adresă pentru a schimba adresa de e-mail.
+        explanation: Confirmați noua adresă pentru a vă schimba adresa de e-mail.
         extra: Dacă această modificare nu a fost inițiată de dvs., vă rugăm să ignorați acest e-mail. Adresa de e-mail pentru contul Mastodon nu se va schimba până când nu accesați link-ul de mai sus.
         subject: 'Mastodon: Confirmați e-mailul pentru %{instance}'
-        title: Verifică adresa de e-mail
+        title: Verificați adresa de e-mail
       reset_password_instructions:
-        action: Schimbă parola
+        action: Schimbați parola
         explanation: Ați solicitat o nouă parolă pentru contul dvs.
-        extra: Dacă nu ați solicitat acest lucru, ignorați acest e-mail. Parola dvs. nu se va schimba până când nu veți accesa link-ul de mai sus și nu veți crea unul nou.
+        extra: Dacă nu ați solicitat acest lucru, vă rugăm să ignorați acest e-mail. Parola dvs. nu se va schimba până când nu veți accesa link-ul de mai sus și nu veți crea unul nou.
         subject: 'Mastodon: Instrucțiuni pentru resetarea parolei'
         title: Resetare parolă
       two_factor_disabled:
         explanation: Conectarea este acum posibilă folosind doar adresa de e-mail și parola.
-        subject: 'Mastodon: Autentificare cu doi factori dezactivată'
+        subject: 'Mastodon: Autentificarea cu doi factori dezactivată'
         subtitle: Autentificarea cu doi factori pentru contul dvs. a fost dezactivată.
         title: A2F dezactivată
       two_factor_enabled:
-        explanation: Pentru autentificare va fi necesar un token generat de aplicația TOTP asociată.
+        explanation: Pentru conectare va fi necesar un token generat de aplicația TOTP asociată.
         subject: 'Mastodon: Autentificare în doi pași activată'
         subtitle: Autentificarea cu doi factori a fost activată pentru contul dvs.
         title: A2F activată
@@ -61,18 +61,18 @@ ro:
         explanation: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
         subject: 'Mastodon: Coduri de recuperare în doi pași regenerate'
         subtitle: Codurile de recuperare anterioare au fost invalidate și s-au generat altele noi.
-        title: Codurile de recuperare în doi pași au fost modificate
+        title: Codurile de recuperare în doi pași modificate
       unlock_instructions:
         subject: 'Mastodon: Instrucțiuni de deblocare'
       webauthn_credential:
         added:
-          explanation: Următoarea cheie de securitate a fost adăugată în contul tău
+          explanation: Următoarea cheie de securitate a fost adăugată în contul dvs.
           subject: 'Mastodon: Noua cheie de securitate'
           title: A fost adăugată o nouă cheie de securitate
         deleted:
-          explanation: Următoarea cheie de securitate a fost ștearsă din contul tău
+          explanation: Următoarea cheie de securitate a fost ștearsă din contul dvs.
           subject: 'Mastodon: Cheie de securitate ștearsă'
-          title: Una dintre cheile tale de securitate a fost ștearsă
+          title: Una dintre cheile dvs. de securitate a fost ștearsă
       webauthn_disabled:
         explanation: Autentificarea cu chei de securitate a fost dezactivată pentru contul dvs.
         extra: Conectarea este acum posibilă folosind doar token-ul generat de aplicația TOTP asociată.
@@ -84,31 +84,31 @@ ro:
         subject: 'Mastodon: Autentificarea prin chei de securitate activată'
         title: Chei de securitate activate
     omniauth_callbacks:
-      failure: Nu te-am putut autentifica de la %{kind} deoarece "%{reason}".
+      failure: Nu v-am putut autentifica de la %{kind} deoarece "%{reason}".
       success: Autentificat cu succes din contul %{kind}.
     passwords:
-      no_token: Nu puteți accesa această pagină fără să veniți dintr-un e-mail de resetare a parolei. Dacă vii dintr-un e-mail de resetare a parolei, te rugăm să te asiguri că ai folosit URL-ul complet furnizat.
-      send_instructions: Dacă adresa ta de e-mail există în baza noastră de date, vei primi în câteva minute un link de recuperare a parolei la adresa ta de e-mail. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
-      send_paranoid_instructions: Dacă adresa ta de e-mail există în baza noastră de date, vei primi în câteva minute un link de recuperare a parolei la adresa ta de e-mail. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
-      updated: Parola ta a fost schimbată cu succes. Acum ești conectat.
-      updated_not_active: Parola ta a fost schimbată cu succes.
+      no_token: Nu puteți accesa această pagină fără să veniți dintr-un e-mail de resetare a parolei. Dacă veniți dintr-un e-mail de resetare a parolei, vă rugăm asigurați-vă că ați folosit URL-ul complet furnizat.
+      send_instructions: Dacă adresa dvs. de e-mail există în baza noastră de date, veți primi în câteva minute un link de recuperare a parolei la adresa dvs. de e-mail. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
+      send_paranoid_instructions: Dacă adresa dvs. de e-mail există în baza noastră de date, veți primi în câteva minute un link de recuperare a parolei la adresa dvs. de e-mail. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
+      updated: Parola dvs. a fost schimbată cu succes. Acum sunteți conectat.
+      updated_not_active: Parola dvs. a fost schimbată cu succes.
     registrations:
-      destroyed: La revedere! Contul tău a fost anulat cu succes. Sperăm să te vedem din nou în curând.
+      destroyed: La revedere! Contul dvs. a fost anulat cu succes. Sperăm să vă vedem din nou în curând.
       signed_up: Bine ați venit! V-ați înregistrat cu succes.
       signed_up_but_inactive: V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. nu este încă activat.
       signed_up_but_locked: V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. este blocat.
-      signed_up_but_pending: Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. După ce faceți clic pe link, vă vom revizui cererea. Veți fi notificat dacă este aprobat.
-      signed_up_but_unconfirmed: Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. Vă rugăm să urmați link-ul pentru a vă activa contul. Vă rugăm să verificați folderul spam dacă nu ați primit acest e-mail.
-      update_needs_confirmation: Ți-ai actualizat contul cu succes, dar trebuie să verificăm noua ta adresă de e-mail. Vă rugăm să verificați adresa de e-mail și să urmați link-ul de confirmare pentru a confirma noua dvs. adresă de e-mail. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
+      signed_up_but_pending: Un mesaj cu un link de confirmare a fost trimis la adresa dvs. de e-mail. După ce faceți clic pe link, vă vom revizui cererea. Veți fi notificat dacă este aprobat.
+      signed_up_but_unconfirmed: Un mesaj cu un link de confirmare a fost trimis la adresa dvs. de e-mail. Vă rugăm să urmați link-ul pentru a vă activa contul. Vă rugăm să verificați folderul spam dacă nu ați primit acest e-mail.
+      update_needs_confirmation: V-ați actualizat contul cu succes, dar trebuie să verificăm noua dvs. adresă de e-mail. Vă rugăm să verificați adresa de e-mail și să urmați link-ul de confirmare pentru a confirma noua dvs. adresă de e-mail. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
       updated: Contul dvs. a fost actualizat cu succes.
     sessions:
       already_signed_out: Deconectat cu succes.
       signed_in: Conectat cu succes.
       signed_out: Deconectat cu succes.
     unlocks:
-      send_instructions: Veți primi un e-mail cu instrucțiuni despre cum să vă deblocați contul în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
-      send_paranoid_instructions: Dacă contul tău există, vei primi un e-mail cu instrucțiuni pentru cum să-l deblochezi în câteva minute. Te rugăm să verifici dosarul spam dacă nu ai primit acest e-mail.
-      unlocked: Contul tău a fost deblocat cu succes. Te rugăm să te autentifici pentru a continua.
+      send_instructions: Veți primi un e-mail cu instrucțiuni despre cum să vă deblocați contul în câteva minute. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
+      send_paranoid_instructions: Dacă contul dvs. există, veți primi un e-mail cu instrucțiuni pentru cum să-l deblocați în câteva minute. Vă rugăm să verificați dosarul spam dacă nu ați primit acest e-mail.
+      unlocked: Contul dvs. a fost deblocat cu succes. Vă rugăm să vă autentificați pentru a continua.
   errors:
     messages:
       already_confirmed: a fost deja confirmat, încercați să vă conectați
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
index fa28373521..7091bcaf7b 100644
--- a/config/locales/doorkeeper.ro.yml
+++ b/config/locales/doorkeeper.ro.yml
@@ -3,10 +3,10 @@ ro:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Numele aplicației
+        name: Nume aplicație
         redirect_uri: URI de redirecționare
         scopes: Domenii
-        website: Pagina web a aplicației
+        website: Website aplicație
     errors:
       models:
         doorkeeper/application:
@@ -19,60 +19,60 @@ ro:
   doorkeeper:
     applications:
       buttons:
-        authorize: Autorizează
-        cancel: Anulează
-        destroy: Distruge
-        edit: Editează
-        submit: Trimite
+        authorize: Autorizare
+        cancel: Anulare
+        destroy: Distrugere
+        edit: Editare
+        submit: Trimitere
       confirmations:
-        destroy: Ești sigur?
+        destroy: Sunteți sigur?
       edit:
-        title: Editați aplicația
+        title: Editare aplicație
       form:
         error: Ups! Verificați formularul pentru posibile erori
       help:
         native_redirect_uri: Utilizați %{native_redirect_uri} pentru teste locale
-        redirect_uri: Folosește câte o linie per URI
+        redirect_uri: Folosiți câte o linie per URI
         scopes: Separați domeniile cu spații. Lăsați necompletat pentru a utiliza domeniile implicite.
       index:
         application: Aplicație
-        callback_url: URL pentru callback
-        delete: Șterge
+        callback_url: Callback URL
+        delete: Ștergere
         empty: Nu aveți aplicații.
         name: Nume
         new: Aplicație nouă
         scopes: Domenii
-        show: Arată
-        title: Aplicațiile tale
+        show: Afișare
+        title: Aplicațiile dvs.
       new:
         title: Aplicație nouă
       show:
         actions: Acțiuni
         application_id: Cheie client
-        callback_urls: URL-uri de callback
+        callback_urls: Callback URL-uri
         scopes: Domenii
-        secret: Codul secret al clientului
+        secret: Secretul clientului
         title: 'Aplicație: %{name}'
     authorizations:
       buttons:
-        authorize: Autorizează
-        deny: Interzice
+        authorize: Autorizare
+        deny: Refuzare
       error:
         title: A apărut o eroare
       new:
         prompt_html: "%{client_name} dorește să îți acceseze contul. Este o aplicație terță. <strong>Dacă nu aveți încredere în ea, atunci nu ar trebui să o autorizați.</strong>"
-        review_permissions: Revizuiește permisiunile
+        review_permissions: Revizuiți permisiunile
         title: Autorizare necesară
       show:
         title: Copiați acest cod de autorizare și lipiți-l în aplicație.
     authorized_applications:
       buttons:
-        revoke: Revocați
+        revoke: Revocare
       confirmations:
-        revoke: Ești sigur?
+        revoke: Sunteți sigur?
       index:
         authorized_at: Autorizat pe %{date}
-        description_html: Acestea sunt aplicațiile care vă pot accesa contul folosind API. Dacă există aplicații pe care nu le recunoașteți, sau o aplicație se comportă necorespunzător, puteți revoca accesul.
+        description_html: Acestea sunt aplicațiile care vă pot accesa contul folosind API-ul. Dacă există aplicații pe care nu le recunoașteți, sau o aplicație se comportă necorespunzător, puteți revoca accesul.
         last_used_at: Utilizat ultima dată pe %{date}
         never_used: Nu a fost folosit niciodată
         scopes: Permisiuni
@@ -86,9 +86,9 @@ ro:
         invalid_grant: Acordarea autorizației furnizată este invalidă, expirată, revocată, nu corespunde URI-ului de redirecționare folosit în cererea de autorizare, sau a fost eliberat altui client.
         invalid_redirect_uri: Uri-ul de redirecționare inclus nu este valid.
         invalid_request:
-          missing_param: 'Lipseste parametrul necesar: %{value}.'
+          missing_param: 'Lipsește parametrul necesar: %{value}.'
           request_not_authorized: Solicitarea trebuie să fie autorizată. Parametrul necesar pentru solicitarea de autorizare lipsește sau este invalid.
-          unknown: Solicitarea nu are un parametru necesar, include un parametru nesuportat sau este dealtfel formatat incorect.
+          unknown: Solicitarea nu are un parametru necesar, include un parametru nesuportat sau este formatat incorect.
         invalid_resource_owner: Acreditările proprietarului de resurse nu sunt valide sau proprietarul de resurse nu poate fi găsit
         invalid_scope: Domeniul de aplicare solicitat este invalid, necunoscut sau incorect.
         invalid_token:
@@ -137,12 +137,12 @@ ro:
         notifications: Notificări
         push: Notificări push
         reports: Rapoarte
-        search: Caută
+        search: Căutare
         statuses: Postări
     layouts:
       admin:
         nav:
-          applications: Aplicaţii
+          applications: Aplicații
           oauth2_provider: Furnizor OAuth2
       application:
         title: Este necesară autorizarea OAuth
@@ -160,7 +160,7 @@ ro:
       read:accounts: vede informațiile privind conturile
       read:blocks: vede blocurile tale
       read:bookmarks: vede marcajele tale
-      read:favourites: vezi favoritele tale
+      read:favourites: vede favoritele tale
       read:filters: vede filtrele tale
       read:follows: vede urmăririle tale
       read:lists: vede listele tale
@@ -168,7 +168,7 @@ ro:
       read:notifications: vede notificările tale
       read:reports: vede raportările tale
       read:search: caută în numele tău
-      read:statuses: vede toate stările
+      read:statuses: vede toate postările
       write: modifică toate datele contului tău
       write:accounts: modifică profilul tău
       write:blocks: blochează conturile și domeniile
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 7916e27f3a..ebe26c3f14 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -604,7 +604,7 @@ es-MX:
         suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y eventualmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los reportes contra esta cuenta.
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este reporte. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
-      actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
+      actions_no_posts: Este informe no tiene ningún mensaje asociado para eliminar
       add_to_report: Añadir más al reporte
       already_suspended_badges:
         local: Ya suspendido en este servidor
@@ -911,8 +911,8 @@ es-MX:
     trends:
       allow: Permitir
       approved: Aprobado
-      confirm_allow: "¿Estás seguro de que deseas permitir la etiqueta seleccionada?"
-      confirm_disallow: "¿Estás seguro de que deseas restringir la etiqueta seleccionada?"
+      confirm_allow: "¿Estás seguro de que deseas permitir las etiquetas seleccionadas?"
+      confirm_disallow: "¿Estás seguro de que deseas restringir las etiquetas seleccionadas?"
       disallow: Rechazar
       links:
         allow: Permitir enlace
@@ -980,7 +980,7 @@ es-MX:
         used_by_over_week:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
-      title: Recomendaciones y tendencias
+      title: Recomendaciones y Tendencias
       trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 16716641f9..c652876f3a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -604,7 +604,7 @@ es:
         suspend_description_html: La cuenta y todos sus contenidos serán inaccesibles y finalmente eliminados, e interactuar con ella será imposible. Reversible durante 30 días. Cierra todos los informes contra esta cuenta.
       actions_description_html: Decide qué medidas tomar para resolver esta denuncia. Si tomas una acción punitiva contra la cuenta denunciada, se le enviará a dicha cuenta una notificación por correo electrónico, excepto cuando se seleccione la categoría <strong>Spam</strong>.
       actions_description_remote_html: Decide qué medidas tomar para resolver este informe. Esto solo afectará a la forma en que <strong>tu servidor</strong> se comunica con esta cuenta remota y gestiona su contenido.
-      actions_no_posts: Este informe no incluye ninguna publicación asociada a eliminar
+      actions_no_posts: Este informe no tiene ningún mensaje asociado para eliminar
       add_to_report: Añadir más al reporte
       already_suspended_badges:
         local: Ya suspendido en este servidor
@@ -911,8 +911,8 @@ es:
     trends:
       allow: Permitir
       approved: Aprobadas
-      confirm_allow: "¿Estás seguro de que deseas permitir la etiqueta seleccionada?"
-      confirm_disallow: "¿Estás seguro de que deseas restringir la etiqueta seleccionada?"
+      confirm_allow: "¿Estás seguro de que deseas permitir las etiquetas seleccionadas?"
+      confirm_disallow: "¿Estás seguro de que deseas restringir las etiquetas seleccionadas?"
       disallow: No permitir
       links:
         allow: Permitir enlace
@@ -980,7 +980,7 @@ es:
         used_by_over_week:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
-      title: Recomendaciones y tendencias
+      title: Recomendaciones y Tendencias
       trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
diff --git a/config/locales/et.yml b/config/locales/et.yml
index d8cdbf4143..aca4f93c4d 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -24,6 +24,7 @@ et:
   admin:
     account_actions:
       action: Täida tegevus
+      already_silenced: See konto on juba piiratud.
       already_suspended: See konto on juba peatatud.
       title: Rakenda moderaatori tegevus kasutajale %{acct}
     account_moderation_notes:
@@ -133,6 +134,7 @@ et:
       resubscribe: Telli taas
       role: Roll
       search: Otsi
+      search_same_email_domain: Muud kasutajad sama e-posti domeeniga
       search_same_ip: Teised kasutajad, kellel on sama IP
       security: Turvalisus
       security_measures:
@@ -173,21 +175,26 @@ et:
         approve_appeal: Rahulda vaidlustus
         approve_user: Kinnita kasutaja
         assigned_to_self_report: Määras Teavituse
+        change_email_user: Muuda kasutaja e-posti
         change_role_user: Muuda kasutaja rolli
         confirm_user: Kasutaja kinnitatud
         create_account_warning: Lisas hoiatuse
         create_announcement: Lisas teadaande
+        create_canonical_email_block: Loo e-posti blokeering
         create_custom_emoji: Lisas kohandatud emotikoni
         create_domain_allow: Lisas lubatud domeeni
         create_domain_block: Domeeni blokeerimine
+        create_email_domain_block: Loo e-posti domeeni blokeering
         create_ip_block: IP-reegli lisamine
         create_unavailable_domain: Kättesaamatu domeeni lisamine
         create_user_role: Loo roll
         demote_user: Alandas kasutaja
         destroy_announcement: Eemaldas teadaande
+        destroy_canonical_email_block: Kustuta e-posti blokeering
         destroy_custom_emoji: Eemaldas kohandatud emotikoni
         destroy_domain_allow: Eemaldas lubatud domeeni
         destroy_domain_block: Domeeniblokeeringu eemaldamine
+        destroy_email_domain_block: Kustuta e-posti domeeni blokeering
         destroy_instance: Domeeni kustutamine
         destroy_ip_block: IP-reegli kustutamine
         destroy_status: Kustuta postitus
@@ -228,20 +235,26 @@ et:
         approve_appeal_html: "%{name} kiitis heaks modereerimise otsuse vaidlustuse %{target} poolt"
         approve_user_html: "%{name} kiitis heaks registreerimise %{target} poolt"
         assigned_to_self_report_html: "%{name} määras raporti %{target} endale"
+        change_email_user_html: "%{name} muutis kasutaja %{target} e-postiaadressi"
         change_role_user_html: "%{name} muutis %{target} rolli"
+        confirm_user_html: "%{name} kinnitas kasutaja %{target} e-postiaadressi"
         create_account_warning_html: "%{name} saatis %{target} hoiatuse"
         create_announcement_html: "%{name} lõi uue teate %{target}"
+        create_canonical_email_block_html: "%{name} blokeeris e-posti räsiga %{target}"
         create_custom_emoji_html: "%{name} laadis üles uue emotikoni %{target}"
         create_domain_allow_html: "%{name} lubas föderatsiooni domeeniga %{target}"
         create_domain_block_html: "%{name} keelas domeeni %{target}"
+        create_email_domain_block_html: "%{name} blokeeris e-posti domeeni %{target}"
         create_ip_block_html: "%{name} lõi IP-aadressile %{target} reegli"
         create_unavailable_domain_html: "%{name} lõpetas edastamise domeeni %{target}"
         create_user_role_html: "%{name} lõi rolli %{target}"
         demote_user_html: "%{name} alandas kasutajat %{target}"
         destroy_announcement_html: "%{name} kustutas teadaande %{target}"
+        destroy_canonical_email_block_html: "%{name} eemaldas blokeeringu e-postilt räsiga %{target}"
         destroy_custom_emoji_html: "%{name} kustutas emotikoni %{target}"
         destroy_domain_allow_html: "%{name} keelas föderatsiooni domeeniga %{target}"
         destroy_domain_block_html: "%{name} lubas domeeni %{target}"
+        destroy_email_domain_block_html: "%{name} eemaldas blokeeringu e-posti domeenilt %{target}"
         destroy_instance_html: "%{name} kustutas domeeni %{target}"
         destroy_ip_block_html: "%{name} kustutas IP-aadressi %{target} reegli"
         destroy_status_html: "%{name} kustutas %{target} postituse"
@@ -260,6 +273,7 @@ et:
         reject_user_html: "%{name} lükkas %{target} liitumissoovi tagasi"
         remove_avatar_user_html: "%{name} eemaldas %{target} avatari"
         reopen_report_html: "%{name} taasavas raporti %{target}"
+        resend_user_html: "%{name} lähtestas %{target} kinnituskirja e-posti"
         reset_password_user_html: "%{name} lähtestas %{target} salasõna"
         resolve_report_html: "%{name} lahendas raporti %{target}"
         sensitive_account_html: "%{name} märkis %{target} meedia kui tundlik sisu"
@@ -420,6 +434,7 @@ et:
       attempts_over_week:
         one: "%{count} katse viimase nädala kestel"
         other: "%{count} liitumiskatset viimase nädala kestel"
+      created_msg: E-posti domeen edukalt blokeeritud
       delete: Kustuta
       dns:
         types:
@@ -428,8 +443,12 @@ et:
       new:
         create: Lisa domeen
         resolve: Domeeni lahendamine
+        title: Blokeeri uus e-posti domeen
+      no_email_domain_block_selected: Ühtegi e-posti domeeni blokeeringut ei muudetud, kuna ühtegi ei valitud
       not_permitted: Ei ole lubatud
+      resolved_dns_records_hint_html: Domeeninimi lahendatakse järgmistele MX-domeenidele, mis on lõppkokkuvõttes vastutavad e-kirjade vastuvõtmise eest. MX-domeeni blokeerimine blokeerib registreerimise mis tahes e-posti aadressilt, mis kasutab sama MX-domeeni, isegi kui nähtav domeeninimi on erinev. <strong>Ole ettevaatlik, et mitte blokeerida peamisi e-posti teenusepakkujaid.</strong>
       resolved_through_html: Lahendatud %{domain} kaudu
+      title: Blokeeritud e-posti domeenid
     export_domain_allows:
       new:
         title: Lubatud domeenide import
@@ -583,6 +602,7 @@ et:
         resolve_description_html: Raporteeritud konto suhtes ei võeta midagi ette, juhtumit ei registreerita ja raport suletakse.
         silence_description_html: Konto saab olema nähtav ainult senistele jälgijatele või otsestele pöördujatele, mõjutates avalikku levi. On tagasipööratav. Sulgeb kõik konto suhtes esitatud raportid.
         suspend_description_html: See konto ja kogu selle sisu muutub kättesaamatuks ning kustub lõpuks ja igasugune suhtlus sellega muutub võimatuks. Tagasipööratav 30 päeva jooksul. Lõpetab kõik selle konto kohta esitatud kaebused.
+      actions_description_html: Otsusta, milliseid meetmeid selle raporti lahendamiseks võtta. Kui võtad raporteeritud konto suhtes karistusmeetme, saadetakse talle e-posti teade, välja arvatud juhul, kui valid kategooria <strong>Rämps</strong>.
       actions_description_remote_html: Otsusta, mida teha selle raporti lahendamiseks. See mõjutab ainult seda, kuidas <strong>Sinu</strong> server selle kaugkontoga suhtleb ning selle sisu käsitleb.
       actions_no_posts: Selle raportiga pole seotud ühtegi postitust, mida kustutada
       add_to_report: Lisa raportile juurde
@@ -648,6 +668,7 @@ et:
         delete_data_html: Kustuta tänasest 30 päeva pärast kasutaja <strong>@%{acct}</strong> profiil ja sisu, kui vahepeal tema kontot ei taastata
         preview_preamble_html: "<strong>@%{acct}</strong> saab järgmise sisuga hoiatuse:"
         record_strike_html: Salvesta <strong>@%{acct}</strong> kohta juhtum, et aidata selle konto tulevaste rikkumiste puhul reageerida
+        send_email_html: Saada hoiatuskiri <strong>@%{acct}</strong>
         warning_placeholder: Valikuline täiendav põhjendus modereerimisele.
       target_origin: Raporteeritud konto päritolu
       title: Teavitused
@@ -687,6 +708,7 @@ et:
         manage_appeals: Vaidlustuste haldamine
         manage_appeals_description: Lubab kasutajail läbi vaadata modereerimisotsuste vaidlustusi
         manage_blocks: Keeldude haldamine
+        manage_blocks_description: Lubab kasutajatel blokeerida e-posti teenusepakkujaid ja IP-aadresse
         manage_custom_emojis: Halda isetehtud emotikone
         manage_custom_emojis_description: Lubab kasutajatel hallata serveris isetehtud emotikone
         manage_federation: Halda födereerumist
@@ -704,6 +726,7 @@ et:
         manage_taxonomies: Halda taksonoomiaid
         manage_taxonomies_description: Luba kasutajatel populaarset sisu üle vaadata ning uuendada siltide sätteid
         manage_user_access: Halda kasutajate ligipääsu
+        manage_user_access_description: Võimaldab kasutajatel keelata teiste kasutajate kaheastmelise autentimise, muuta oma e-posti aadressi ja lähtestada oma parooli
         manage_users: Kasutajate haldamine
         manage_users_description: Lubab kasutajail näha teiste kasutajate üksikasju ja teha nende suhtes modereerimisotsuseid
         manage_webhooks: Halda webhook'e
@@ -1137,6 +1160,12 @@ et:
       view_strikes: Vaata enda eelnevaid juhtumeid
     too_fast: Vorm esitatud liiga kiirelt, proovi uuesti.
     use_security_key: Kasuta turvavõtit
+  author_attribution:
+    example_title: Näidistekst
+    hint_html: Määra, kuidas sind krediteeritakse, kui linke Mastodonis jagatakse.
+    more_from_html: Rohkem kasutajalt %{name}
+    s_blog: Kasutaja %{name} blogi
+    title: Autori tunnustamine
   challenge:
     confirm: Jätka
     hint_html: "<strong>Nõuanne:</strong> Me ei küsi salasõna uuesti järgmise tunni jooksul."
@@ -1418,6 +1447,16 @@ et:
     unsubscribe:
       action: Jah, lõpeta tellimine
       complete: Tellimine lõpetatud
+      confirmation_html: Kas oled kindel, et soovid loobuda %{type} tellimisest oma e-postiaadressile %{email} Mastodonist kohas %{domain}? Saad alati uuesti tellida oma <a href="%{settings_path}">e-posti teavituste seadetest</a>.
+      emails:
+        notification_emails:
+          favourite: lemmikuks märkimise teavituskirjade
+          follow: jälgimiste teavituskirjade
+          follow_request: jälgimistaotluste teavituskirjade
+          mention: mainimiste teavituskirjade
+          reblog: jagamiste teavituskirjade
+      resubscribe_html: Kui loobusid tellimisest ekslikult, saad uuesti tellida oma <a href="%{settings_path}">e-posti teavituste seadetest</a>.
+      success_html: Sa ei saa enam %{type} teateid oma e-postile %{email} Mastodonist kohas %{domain}.
       title: Loobu tellimisest
   media_attachments:
     validations:
@@ -1906,6 +1945,7 @@ et:
     instructions_html: Kopeeri ja kleebi allpool olev kood oma lehe HTML lähtekoodi. Seejärel lisa oma kodulehe aadress profiili "Muuda profiili" taabi ühte lisavälja ning salvesta muudatused.
     verification: Kinnitamine
     verified_links: Sinu kontrollitud lingid
+    website_verification: Veebilehe kontrollimine
   webauthn_credentials:
     add: Uue turvavõtme lisamine
     create:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 5290ff5374..b70a515fd1 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -24,6 +24,7 @@ fr-CA:
   admin:
     account_actions:
       action: Effectuer l'action
+      already_silenced: Ce compte a déjà été limité.
       already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
@@ -133,7 +134,7 @@ fr-CA:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
-      search_same_email_domain: Autres utilisateurs avec le même domaine de courriel
+      search_same_email_domain: Autres utilisateur·rice·s ayant le même domaine de messagerie
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -270,6 +271,7 @@ fr-CA:
         reject_user_html: "%{name} a rejeté l’inscription de %{target}"
         remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
         reopen_report_html: "%{name} a rouvert le signalement %{target}"
+        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
         reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
         resolve_report_html: "%{name} a résolu le signalement %{target}"
         sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
@@ -284,6 +286,7 @@ fr-CA:
         update_custom_emoji_html: "%{name} a mis à jour l'émoji %{target}"
         update_domain_block_html: "%{name} a mis à jour le blocage de domaine pour %{target}"
         update_ip_block_html: "%{name} a modifié la règle pour l'IP %{target}"
+        update_report_html: "%{name} a mis à jour le rapport de signalement %{target}"
         update_status_html: "%{name} a mis à jour le message de %{target}"
         update_user_role_html: "%{name} a changé le rôle %{target}"
       deleted_account: compte supprimé
@@ -439,7 +442,12 @@ fr-CA:
         create: Créer le blocage
         resolve: Résoudre le domaine
         title: Blocage d'un nouveau domaine de messagerie électronique
+      no_email_domain_block_selected: Aucun blocage de domaine de messagerie n'a été modifié comme aucun n'a été sélectionné
       not_permitted: Non autorisé
+      resolved_dns_records_hint_html: |-
+        Le nom de domaine se réfère aux domaines MX suivants, qui sont à leur tour responsables de la réception des courriels.
+
+        Le blocage d'un domaine MX empêchera l'inscription depuis toute adresse électronique ayant recours au même domaine MX, et ce même si le nom de domaine visible est différent. <strong>Veillez à ne pas bloquer les principaux fournisseurs de services de messagerie.</strong>
       resolved_through_html: Résolu par %{domain}
       title: Domaines de messagerie électronique bloqués
     export_domain_allows:
@@ -595,7 +603,9 @@ fr-CA:
         resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
         silence_description_html: Le compte ne sera visible que par ceux qui le suivent déjà ou qui le recherchent manuellement, ce qui limite fortement sa portée. Cette action peut toujours être annulée. Cloture tous les signalements concernant ce compte.
         suspend_description_html: Le compte et tous ses contenus seront inaccessibles et finalement supprimés, et il sera impossible d'interagir avec lui. Réversible dans les 30 jours. Cloture tous les signalements concernant ce compte.
+      actions_description_html: Décidez de l'action à entreprendre pour résoudre ce signalement. Si vous prenez une mesure punitive à l'encontre du compte signalé, une notification par courrier électronique lui sera envoyée, excepté lorsque la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
+      actions_no_posts: Ce signalement n'a pas de messages qui lui sont associés et qui devraient être supprimés
       add_to_report: Ajouter davantage au rapport
       already_suspended_badges:
         local: Déjà suspendu sur ce serveur
@@ -717,6 +727,7 @@ fr-CA:
         manage_taxonomies: Gérer les taxonomies
         manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
         manage_user_access: Gérer l'accès utilisateur
+        manage_user_access_description: Permet aux utilisateur·rice·s de désactiver l'authentification à deux facteurs des autres utilisateur·rice·s, de modifier leur adresse électronique et de réinitialiser leur mot de passe
         manage_users: Gérer les utilisateur·rice·s
         manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
         manage_webhooks: Gérer les points d’ancrage web
@@ -879,16 +890,19 @@ fr-CA:
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
       moderation:
+        not_trendable: Ne peut être en tendance
         not_usable: Non utilisable
         pending_review: En attente de traitement
         review_requested: Révision requise
         reviewed: Traité
         title: État
+        trendable: Peut s'afficher dans les tendances
         unreviewed: Non traité
         usable: Utilisable
       name: Nom
       newest: Plus récents
       oldest: Plus anciens
+      open: Afficher publiquement
       reset: Réinitialiser
       review: État du traitement
       search: Recherche
@@ -1434,6 +1448,15 @@ fr-CA:
     unsubscribe:
       action: Oui, me désabonner
       complete: Désabonné·e
+      emails:
+        notification_emails:
+          favourite: e-mails de notifications de favoris
+          follow: e-mails de notifications d’abonnements
+          follow_request: e-mails de demandes d’abonnements
+          mention: e-mails de notifications de mentions
+          reblog: e-mails de notifications de partages
+      resubscribe_html: Si vous vous êtes désinscrit par erreur, vous pouvez vous réinscrire à partir de vos <a href="%{settings_path}">paramètres de notification par e-mail</a>.
+      success_html: Vous ne recevrez plus de %{type} pour Mastodon sur %{domain} à votre adresse e-mail à %{email}.
       title: Se désabonner
   media_attachments:
     validations:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8ee4e35acc..bc616d2896 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -24,6 +24,7 @@ fr:
   admin:
     account_actions:
       action: Effectuer l'action
+      already_silenced: Ce compte a déjà été limité.
       already_suspended: Ce compte est déjà suspendu.
       title: Effectuer une action de modération sur %{acct}
     account_moderation_notes:
@@ -133,7 +134,7 @@ fr:
       resubscribe: Se réabonner
       role: Rôle
       search: Rechercher
-      search_same_email_domain: Autres utilisateurs avec le même domaine de courriel
+      search_same_email_domain: Autres utilisateur·rice·s ayant le même domaine de messagerie
       search_same_ip: Autres utilisateur·rice·s avec la même IP
       security: Sécurité
       security_measures:
@@ -270,6 +271,7 @@ fr:
         reject_user_html: "%{name} a rejeté l’inscription de %{target}"
         remove_avatar_user_html: "%{name} a supprimé l'avatar de %{target}"
         reopen_report_html: "%{name} a rouvert le signalement %{target}"
+        resend_user_html: "%{name} a renvoyé l'e-mail de confirmation pour %{target}"
         reset_password_user_html: "%{name} a réinitialisé le mot de passe de l'utilisateur·rice %{target}"
         resolve_report_html: "%{name} a résolu le signalement %{target}"
         sensitive_account_html: "%{name} a marqué le média de %{target} comme sensible"
@@ -284,6 +286,7 @@ fr:
         update_custom_emoji_html: "%{name} a mis à jour l'émoji %{target}"
         update_domain_block_html: "%{name} a mis à jour le blocage de domaine pour %{target}"
         update_ip_block_html: "%{name} a modifié la règle pour l'IP %{target}"
+        update_report_html: "%{name} a mis à jour le rapport de signalement %{target}"
         update_status_html: "%{name} a mis à jour le message de %{target}"
         update_user_role_html: "%{name} a changé le rôle %{target}"
       deleted_account: compte supprimé
@@ -439,7 +442,12 @@ fr:
         create: Créer le blocage
         resolve: Résoudre le domaine
         title: Blocage d'un nouveau domaine de messagerie électronique
+      no_email_domain_block_selected: Aucun blocage de domaine de messagerie n'a été modifié comme aucun n'a été sélectionné
       not_permitted: Non autorisé
+      resolved_dns_records_hint_html: |-
+        Le nom de domaine se réfère aux domaines MX suivants, qui sont à leur tour responsables de la réception des courriels.
+
+        Le blocage d'un domaine MX empêchera l'inscription depuis toute adresse électronique ayant recours au même domaine MX, et ce même si le nom de domaine visible est différent. <strong>Veillez à ne pas bloquer les principaux fournisseurs de services de messagerie.</strong>
       resolved_through_html: Résolu par %{domain}
       title: Domaines de messagerie électronique bloqués
     export_domain_allows:
@@ -595,7 +603,9 @@ fr:
         resolve_description_html: Aucune mesure ne sera prise contre le compte signalé, aucune sanction ne sera enregistrée et le sigalement sera clôturé.
         silence_description_html: Le compte ne sera visible que par ceux qui le suivent déjà ou qui le recherchent manuellement, ce qui limite fortement sa portée. Cette action peut toujours être annulée. Cloture tous les signalements concernant ce compte.
         suspend_description_html: Le compte et tous ses contenus seront inaccessibles et finalement supprimés, et il sera impossible d'interagir avec lui. Réversible dans les 30 jours. Cloture tous les signalements concernant ce compte.
+      actions_description_html: Décidez de l'action à entreprendre pour résoudre ce signalement. Si vous prenez une mesure punitive à l'encontre du compte signalé, une notification par courrier électronique lui sera envoyée, excepté lorsque la catégorie <strong>Spam</strong> est sélectionnée.
       actions_description_remote_html: Décidez des mesures à prendre pour résoudre ce signalement. Cela n'affectera que la manière dont <strong>votre</strong> serveur communique avec ce compte distant et traite son contenu.
+      actions_no_posts: Ce signalement n'a pas de messages qui lui sont associés et qui devraient être supprimés
       add_to_report: Ajouter davantage au rapport
       already_suspended_badges:
         local: Déjà suspendu sur ce serveur
@@ -717,6 +727,7 @@ fr:
         manage_taxonomies: Gérer les taxonomies
         manage_taxonomies_description: Permet aux utilisateur⋅rice⋅s d'examiner les contenus tendance et de mettre à jour les paramètres des hashtags
         manage_user_access: Gérer l'accès utilisateur
+        manage_user_access_description: Permet aux utilisateur·rice·s de désactiver l'authentification à deux facteurs des autres utilisateur·rice·s, de modifier leur adresse électronique et de réinitialiser leur mot de passe
         manage_users: Gérer les utilisateur·rice·s
         manage_users_description: Permet aux utilisateur⋅rice⋅s de voir les détails des autres utilisateur⋅rice⋅s et d'effectuer des actions de modération en conséquence
         manage_webhooks: Gérer les points d’ancrage web
@@ -879,16 +890,19 @@ fr:
         message_html: "<strong>Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril.</strong>"
     tags:
       moderation:
+        not_trendable: Ne peut être en tendance
         not_usable: Non utilisable
         pending_review: En attente de traitement
         review_requested: Révision requise
         reviewed: Traité
         title: État
+        trendable: Peut s'afficher dans les tendances
         unreviewed: Non traité
         usable: Utilisable
       name: Nom
       newest: Plus récents
       oldest: Plus anciens
+      open: Afficher publiquement
       reset: Réinitialiser
       review: État du traitement
       search: Recherche
@@ -1434,6 +1448,15 @@ fr:
     unsubscribe:
       action: Oui, se désinscrire
       complete: Désinscrit
+      emails:
+        notification_emails:
+          favourite: e-mails de notifications de favoris
+          follow: e-mails de notifications d’abonnements
+          follow_request: e-mails de demandes d’abonnements
+          mention: e-mails de notifications de mentions
+          reblog: e-mails de notifications de partages
+      resubscribe_html: Si vous vous êtes désinscrit par erreur, vous pouvez vous réinscrire à partir de vos <a href="%{settings_path}">paramètres de notification par e-mail</a>.
+      success_html: Vous ne recevrez plus de %{type} pour Mastodon sur %{domain} à votre adresse e-mail à %{email}.
       title: Se désinscrire
   media_attachments:
     validations:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 09d5f7ae18..1071871c95 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -30,6 +30,7 @@ ga:
   admin:
     account_actions:
       action: Déan gníomh
+      already_silenced: Tá teorainn leis an gcuntas seo cheana féin.
       already_suspended: Tá an cuntas seo curtha ar fionraí cheana féin.
       title: Dean gníomh modhnóireachta ar %{acct}
     account_moderation_notes:
@@ -1213,6 +1214,12 @@ ga:
       view_strikes: Féach ar stailceanna san am atá caite i gcoinne do chuntais
     too_fast: Cuireadh an fhoirm isteach róthapa, triail arís.
     use_security_key: Úsáid eochair shlándála
+  author_attribution:
+    example_title: Téacs samplach
+    hint_html: Rialú conas a chuirtear chun sochair tú nuair a roinntear naisc ar Mastodon.
+    more_from_html: Tuilleadh ó %{name}
+    s_blog: Blag %{name}
+    title: Leithdháil an údair
   challenge:
     confirm: Lean ar aghaidh
     hint_html: "<strong>Leid:</strong> Ní iarrfaimid do phasfhocal ort arís go ceann uair an chloig eile."
@@ -2029,6 +2036,7 @@ ga:
     instructions_html: Cóipeáil agus greamaigh an cód thíos isteach i HTML do shuíomh Gréasáin. Ansin cuir seoladh do shuíomh Gréasáin isteach i gceann de na réimsí breise ar do phróifíl ón gcluaisín "Cuir próifíl in eagar" agus sábháil athruithe.
     verification: Fíorú
     verified_links: Do naisc fhíoraithe
+    website_verification: Fíorú láithreán gréasáin
   webauthn_credentials:
     add: Cuir eochair shlándála nua leis
     create:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 3f30d37823..5e63b5bd23 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -28,6 +28,7 @@ gd:
   admin:
     account_actions:
       action: Gabh an gnìomh
+      already_silenced: Chaidh an cunntas seo a chuingeachadh mu thràth.
       already_suspended: Chaidh an cunntas seo a chur à rèim mu thràth.
       title: Gabh gnìomh maorsainneachd air %{acct}
     account_moderation_notes:
@@ -1195,6 +1196,12 @@ gd:
       view_strikes: Seall na rabhaidhean a fhuair an cunntas agad roimhe
     too_fast: Chaidh am foirm a chur a-null ro luath, feuch ris a-rithist.
     use_security_key: Cleachd iuchair tèarainteachd
+  author_attribution:
+    example_title: Ball-sampaill teacsa
+    hint_html: Stùirich mar a thèid iomradh a thoirt ort nuair a thèid ceangal a cho-roinneadh air Mastodon.
+    more_from_html: Barrachd o %{name}
+    s_blog: Bloga aig %{name}
+    title: Aithris air an ùghdar
   challenge:
     confirm: Lean air adhart
     hint_html: "<strong>Gliocas:</strong> Chan iarr sinn am facal-faire agad ort a-rithist fad uair a thìde."
@@ -1998,6 +2005,7 @@ gd:
     instructions_html: Dèan lethbhreac dhen chòd gu h-ìosal is cuir a-steach ann an HTML na làraich-lìn agad e. An uairsin, cuir seòladh na làraich-lìn agad ri fear dhe na raointean a bharrachd air a’ phròifil agad o thaba “Deasaich a’ phròifil” agus sàbhail na h-atharraichean.
     verification: Dearbhadh
     verified_links: Na ceanglaichean dearbhte agad
+    website_verification: Dearbhadh làraich-lìn
   webauthn_credentials:
     add: Cuir iuchair tèarainteachd ùr ris
     create:
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 42495053e9..fa07eb6f59 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -421,9 +421,21 @@ lt:
       domain: Domenas
       new:
         create: Pridėto domeną
+    export_domain_allows:
+      new:
+        title: Importuoti domeno leidžiamus
+      no_file: Nėra pasirinkto failo
     export_domain_blocks:
       import:
         description_html: Netrukus importuosi domenų blokavimų sąrašą. Labai atidžiai peržiūrėk šį sąrašą, ypač jei ne tu jį sudarei.
+        existing_relationships_warning: Esami sekimo sąryšiai
+        private_comment_description_html: 'Kad būtų lengviau atsekti, iš kur importuoti blokavimai, importuoti blokavimai bus kuriami su šiuo privačiu komentaru: <q>%{comment}</q>'
+        private_comment_template: Importuota iš %{source}, %{date}
+        title: Importuoti domeno blokavimus
+      invalid_domain_block: 'Vienas ar daugiau domenų blokavimų buvo praleisti dėl toliau nurodytos (-ų) klaidos (-ų): %{error}'
+      new:
+        title: Importuoti domeno blokavimus
+      no_file: Nėra pasirinkto failo
     follow_recommendations:
       language: Kalbui
       status: Būsena
@@ -853,18 +865,18 @@ lt:
   exports:
     archive_takeout:
       date: Data
-      download: Parsisiųsti archyvą
-      hint_html: Jūs galite prašyti savo <strong>įrašų bei medijos</strong> archyvo. Eksportuota informacija bus ActivityPub formatu, skaitoma suderintų programų. Galite prašyti archyvo, kas 7 dienas.
+      download: Atsisiųsti archyvą
+      hint_html: Gali paprašyti savo <strong>įrašų ir įkeltos medijos</strong> archyvo. Eksportuoti duomenys bus „ActivityPub“ formatu, kurį galima perskaityti bet kuria suderinama programine įranga. Archyvo galima prašyti kas 7 dienas.
       in_progress: Sudaromas archyvas...
       request: Prašyti savo archyvo
       size: Dydis
-    blocks: Jūs blokuojate
+    blocks: Blokuoji
     bookmarks: Žymės
     csv: CSV
-    domain_blocks: Domeno blokai
+    domain_blocks: Domeno blokavimai
     lists: Sąrašai
-    mutes: Jūs tildote
-    storage: Medijos sandėlis
+    mutes: Nutildei
+    storage: Medijos saugykla
   featured_tags:
     add_new: Pridėti naują
     hint_html: "<strong>Savo profilyje parodyk svarbiausius saitažodžius.</strong> Tai puikus įrankis kūrybiniams darbams ir ilgalaikiams projektams sekti, todėl svarbiausios saitažodžiai rodomi matomoje vietoje profilyje ir leidžia greitai pasiekti tavo paties įrašus."
@@ -904,7 +916,7 @@ lt:
       merge_long: Išsaugoti esančius įrašus ir pridėti naujus
       overwrite: Perrašyti
       overwrite_long: Pakeisti senus įrašus naujais
-    preface: Jūs galite importuoti informaciją iš kito serverio, tokią kaip sąrašą žmonių kuriuos sekate.
+    preface: Gali importuoti duomenis, kuriuos eksportavai iš kito serverio, pavyzdžiui, sekamų arba blokuojamų žmonių sąrašą.
     success: Jūsų informacija sėkmingai įkelta ir bus apdorota kaip įmanoma greičiau
     types:
       blocking: Blokuojamų sąrašas
@@ -955,6 +967,8 @@ lt:
   migrations:
     acct: Perkelta į
     cancel: Atšaukti nukreipimą
+    warning:
+      disabled_account: Po to tavo dabartine paskyra nebus galima naudotis visiškai. Tačiau turėsi prieigą prie duomenų eksporto ir pakartotinio aktyvavimo.
   moderation:
     title: Prižiūrėjimas
   notification_mailer:
@@ -1079,6 +1093,7 @@ lt:
     export: Duomenų eksportas
     featured_tags: Rodomi saitažodžiai
     import: Importuoti
+    import_and_export: Importas ir eksportas
     migrate: Paskyros migracija
     notifications: El. laiško pranešimai
     preferences: Nuostatos
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c902625eaa..55a0751811 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -461,6 +461,9 @@ lv:
       title: Sekošanas ieteikumi
       unsuppress: Atjaunot sekošanas rekomendāciju
     instances:
+      audit_log:
+        title: Nesenie pārbaudes žurnāli
+        view_all: Skatīt pilnus pārbaudes žurnālus
       availability:
         description_html:
           one: Ja piegāde uz domēnu neizdodas <strong>%{count} dienu</strong> bez panākumiem, turpmāki piegādes mēģinājumi netiks veikti, ja vien netiks saņemta piegāde <em>no</em> domēna.
@@ -591,7 +594,9 @@ lv:
         resolve_description_html: Pret norādīto kontu netiks veiktas nekādas darbības, netiks reģistrēts brīdinājums, un ziņojums tiks slēgts.
         silence_description_html: Konts būs redzams tikai tiem, kas tam jau seko vai meklē to manuāli, ievērojami ierobežojot tā sasniedzamību. To vienmēr var atgriezt. Tiek aizvērti visi šī konta pārskati.
         suspend_description_html: Konts un viss tā saturs nebūs pieejams un galu galā tiks izdzēsts, un mijiedarbība ar to nebūs iespējama. Atgriežams 30 dienu laikā. Tiek aizvērti visi šī konta pārskati.
+      actions_description_html: Izlem, kādas darbības jāveic, lai atrisinātu šo ziņojumu. Ja tiks pieņemti sodoši mēri pret kontu, par kuru ziņots, tam e-pastā tiks nosūtīts paziņojums, izņemot gadījumus, kad ir atlasīta kategorija <strong>Mēstules</strong>.
       actions_description_remote_html: Izlem, kādas darbības jāveic, lai atrisinātu šo ziņojumu. Tas ietekmēs tikai to, kā <strong>tavs</strong> serveris sazinās ar šo attālo kontu un apstrādā tā saturu.
+      actions_no_posts: Šim ziņojumam nav saistītu ierakstu, kurus izdzēst
       add_to_report: Pievienot varāk paziņošanai
       are_you_sure: Vai esi pārliecināts?
       assign_to_self: Piešķirt man
@@ -1120,7 +1125,7 @@ lv:
     confirm: Turpināt
     hint_html: "<strong>Padoms:</strong> Nākamās stundas laikā mēs tev vairs neprasīsim paroli."
     invalid_password: Nepareiza parole
-    prompt: Lai turpinātu, apstiprini paroli
+    prompt: Lai turpinātu, jāapstiprina parole
   crypto:
     errors:
       invalid_key: nav derīga Ed25519 vai Curve25519 atslēga
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 489fb2b89b..f155490eb5 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -24,6 +24,7 @@ pt-PT:
   admin:
     account_actions:
       action: Executar acção
+      already_silenced: Esta conta já foi limitada.
       already_suspended: Esta conta já foi suspensa.
       title: Executar ação de moderação em %{acct}
     account_moderation_notes:
@@ -272,6 +273,7 @@ pt-PT:
         reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report_html: "%{name} reabriu a denúncia %{target}"
+        resend_user_html: "%{name} reenviou e-mail de confirmação para %{target}"
         reset_password_user_html: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
         resolve_report_html: "%{name} resolveu a denúncia %{target}"
         sensitive_account_html: "%{name} marcou a media de %{target} como sensível"
@@ -432,6 +434,7 @@ pt-PT:
       attempts_over_week:
         one: "%{count} tentativa na última semana"
         other: "%{count} tentativas de inscrição na última semana"
+      created_msg: Domínio de e-mail bloqueado com sucesso
       delete: Eliminar
       dns:
         types:
@@ -440,8 +443,12 @@ pt-PT:
       new:
         create: Adicionar domínio
         resolve: Domínio de resolução
+        title: Bloquear novo domínio de e-mail
+      no_email_domain_block_selected: Não foram alterados quaisquer bloqueios de domínios de e-mail, uma vez que nenhum foi selecionado
       not_permitted: Não permitido
+      resolved_dns_records_hint_html: O nome de domínio resolve para os seguintes domínios MX, que são, em última análise, responsáveis por aceitar o e-mail. Bloquear um domínio MX irá bloquear as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo quando o nome de domínio visível é diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
+      title: Domínios de e-mail bloqueados
     export_domain_allows:
       new:
         title: Importar permissões de domínio
@@ -595,7 +602,9 @@ pt-PT:
         resolve_description_html: Nenhuma ação será tomada contra a conta denunciada, não será registada nenhuma reprimenda, e a denúncia será fechada.
         silence_description_html: O perfil será visível apenas para aqueles que já o seguem ou o procurem manualmente, limitando fortemente o seu alcance. Pode sempre ser revertido. Encerrar todas as denúncias contra esta conta.
         suspend_description_html: A conta e todo o seu conteúdo ficará inacessível e, eventualmente apagado, pelo que interagir com ela será impossível. Reversível durante 30 dias. Encerra todas as denúncias contra esta conta.
+      actions_description_html: Decida a ação a tomar para resolver esta denúncia. Se decidir por uma ação punitiva contra a conta denunciada, um e-mail de notificação será enviado, excetuando quando selecionada a categoria <strong>Spam</strong>.
       actions_description_remote_html: Decida quais as medidas a tomar para resolver esta denúncia. Isso apenas afetará como <strong>o seu</strong> servido comunica com esta conta remota e gere o seu conteúdo.
+      actions_no_posts: Este relatório não tem nenhuma publicação associada para eliminar
       add_to_report: Adicionar mais à denúncia
       already_suspended_badges:
         local: Já suspenso neste servidor
@@ -659,6 +668,7 @@ pt-PT:
         delete_data_html: Eliminar o perfil de <strong>@%{acct}</strong> e conteúdos daqui a 30 dias, a menos que entretanto sejam suspensos
         preview_preamble_html: "<strong>@%{acct}</strong> receberá um aviso com o seguinte conteúdo:"
         record_strike_html: Registar um ataque contra <strong>@%{acct}</strong> para ajudar a escalar futuras violações desta conta
+        send_email_html: Enviar um e-mail de aviso a <strong>@%{acct}</strong>
         warning_placeholder: Argumentos adicionais opcionais para a acção de moderação.
       target_origin: Origem da conta denunciada
       title: Denúncias
@@ -698,6 +708,7 @@ pt-PT:
         manage_appeals: Gerir apelos
         manage_appeals_description: Permite aos utilizadores rever recursos de moderação
         manage_blocks: Gerir bloqueios
+        manage_blocks_description: Permite aos utilizadores bloquear fornecedores de e-mail e endereços IP
         manage_custom_emojis: Gerir emojis personalizados
         manage_custom_emojis_description: Permite aos utilizadores gerirem os emojis personalizados do servidor
         manage_federation: Gerir federação
@@ -715,6 +726,7 @@ pt-PT:
         manage_taxonomies: Gerir taxonomias
         manage_taxonomies_description: Permite aos utilizadores rever o conteúdo em tendência e atualizar as configurações de hashtag
         manage_user_access: Gerir acesso de utilizador
+        manage_user_access_description: Permite aos utilizadores desativar a autenticação de dois factores de outros utilizadores, alterar o seu e-mail e reiniciar a sua palavra-passe
         manage_users: Gerir utilizadores
         manage_users_description: Permite aos utilizadores ver os detalhes de outros utilizadores e executar ações de moderação contra eles
         manage_webhooks: Gerir webhooks
@@ -789,6 +801,7 @@ pt-PT:
       destroyed_msg: Envio do site eliminado com sucesso!
     software_updates:
       critical_update: Crítico — por favor, atualize rapidamente
+      description: Recomenda-se que mantenha a sua instalação do Mastodon atualizada para beneficiar das últimas correções e funcionalidades. Além disso, é por vezes crítico atualizar o Mastodon de forma atempada para evitar problemas de segurança. Por estas razões, o Mastodon verifica se há actualizações a cada 30 minutos e notifica-o de acordo com as suas preferências de notificação por e-mail.
       documentation_link: Saber mais
       release_notes: Notas de lançamento
       title: Atualizações disponíveis
@@ -888,6 +901,7 @@ pt-PT:
       name: Nome
       newest: Mais recente
       oldest: Mais antiga
+      open: Visualizar Publicamente
       reset: Repor
       review: Estado da revisão
       search: Pesquisar
@@ -897,10 +911,16 @@ pt-PT:
     trends:
       allow: Permitir
       approved: Aprovado
+      confirm_allow: Tem a certeza que pretende permitir as etiquetas selecionadas?
+      confirm_disallow: Tem a certeza que pretende rejeitar as etiquetas selecionadas?
       disallow: Não permitir
       links:
         allow: Permitir hiperligação
         allow_provider: Permitir editor
+        confirm_allow: Tem a certeza que pretende permitir as hiperligações selecionadas?
+        confirm_allow_provider: Tem a certeza que pretende permitir os fornecedores selecionados?
+        confirm_disallow: Tem a certeza que pretende rejeitar as hiperligações selecionadas?
+        confirm_disallow_provider: Tem a certeza que pretende rejeitar os fornecedores selecionados?
         description_html: Estas são as ligações que presentemente estão a ser muito partilhadas por contas visíveis pelo seu servidor. Estas podem ajudar os seus utilizador a descobrir o que está a acontecer no mundo. Nenhuma ligação é exibida publicamente até que o editor a aprove. Também pode permitir ou rejeitar ligações em avulso.
         disallow: Não permitir ligação
         disallow_provider: Não permitir editor
@@ -924,6 +944,10 @@ pt-PT:
       statuses:
         allow: Permitir publicação
         allow_account: Permitir autor
+        confirm_allow: Tem a certeza que pretende aceitar os estados selecionados?
+        confirm_allow_account: Tem a certeza que pretende aceitar as contas selecionadas?
+        confirm_disallow: Tem a certeza que pretende rejeitar os estados selecionados?
+        confirm_disallow_account: Tem a certeza que pretende rejeitar as contas selecionadas?
         description_html: Estas são publicações que o seu servidor conhece e que atualmente estão a ser frequentemente partilhadas e adicionadas aos favoritos. Isto pode ajudar os seus utilizadores, novos e retornados, a encontrar mais pessoas para seguir. Nenhuma publicação será exibida publicamente até que aprove o autor, e o autor permita que a sua conta seja sugerida a outros. Você também pode permitir ou rejeitar publicações individualmente.
         disallow: Não permitir publicação
         disallow_account: Não permitir autor
@@ -1041,7 +1065,9 @@ pt-PT:
       guide_link_text: Todos podem contribuir.
     sensitive_content: Conteúdo problemático
   application_mailer:
+    notification_preferences: Alterar preferências de e-mail
     salutation: "%{name},"
+    settings: 'Alterar preferências de e-mail: %{link}'
     unsubscribe: Cancelar subscrição
     view: 'Ver:'
     view_profile: Ver perfil
@@ -1061,6 +1087,7 @@ pt-PT:
       hint_html: Só mais uma coisa! Precisamos confirmar que você é um humano (isto para que possamos evitar spam!). Resolva o CAPTCHA abaixo e clique em "Continuar".
       title: Verificação de segurança
     confirmations:
+      awaiting_review: O seu endereço de e-mail está confirmado! A equipa de %{domain} está agora a analisar a sua inscrição. Receberá um e-mail se a sua conta for aprovada!
       awaiting_review_title: A sua inscrição está a ser revista
       clicking_this_link: clicar nesta hiperligação
       login_link: iniciar sessão
@@ -1068,6 +1095,7 @@ pt-PT:
       redirect_to_app_html: Devia ter sido reencaminhado para a aplicação <strong>%{app_name}</strong>. Se isso não aconteceu, tente %{clicking_this_link} ou volte manualmente para a aplicação.
       registration_complete: O seu registo sem %{domain} está agora concluído!
       welcome_title: Bem-vindo(a), %{name}!
+      wrong_email_hint: Se este endereço de correio eletrónico não estiver correto, pode alterá-lo nas definições de conta.
     delete_account: Eliminar conta
     delete_account_html: Se deseja eliminar a sua conta, pode <a href="%{path}">continuar aqui</a>. Uma confirmação será solicitada.
     description:
@@ -1088,6 +1116,7 @@ pt-PT:
     or_log_in_with: Ou iniciar sessão com
     privacy_policy_agreement_html: Eu li e concordo com a <a href="%{privacy_policy_path}" target="_blank">política de privacidade</a>
     progress:
+      confirm: Confirmar e-mail
       details: Os seus dados
       review: A nossa avaliação
       rules: Aceitar regras
@@ -1109,8 +1138,10 @@ pt-PT:
     security: Alterar palavra-passe
     set_new_password: Editar palavra-passe
     setup:
+      email_below_hint_html: Verifique a sua pasta de spam ou solicite outra. Pode corrigir o seu endereço de e-mail se estiver errado.
       email_settings_hint_html: Clique no link que enviamos para verificar %{email}. Esperaremos aqui.
       link_not_received: Não recebeu um link?
+      new_confirmation_instructions_sent: Irá receber uma nova mensagem de e-mail com a ligação de confirmação dentro de alguns minutos!
       title: Verifique a caixa de entrada do seu e-mail
     sign_in:
       preamble_html: Iniciar sessão com as suas credenciais de <strong>%{domain}</strong>. Se a sua conta estiver hospedada noutro servidor, não poderá iniciar sessão aqui.
@@ -1121,12 +1152,20 @@ pt-PT:
       title: Vamos lá inscrevê-lo em %{domain}.
     status:
       account_status: Estado da conta
+      confirming: A aguardar a confirmação do e-mail para ser concluída.
       functional: A sua conta está totalmente operacional.
+      pending: A sua inscrição está a ser analisada pela nossa equipa. Este processo pode demorar algum tempo. Receberá um e-mail se a sua inscrição for aprovada.
       redirecting_to: A sua conta está inativa porque está atualmente a ser redirecionada para %{acct}.
       self_destruct: Como %{domain} vai fechar, só terá acesso limitado à sua conta.
       view_strikes: Veja as reprimendas anteriores sobre a sua conta
     too_fast: Formulário enviado demasiado rapidamente, tente novamente.
     use_security_key: Usar chave de segurança
+  author_attribution:
+    example_title: Texto de exemplo
+    hint_html: Controle a forma como é creditado quando as hiperligações são partilhadas no Mastodon.
+    more_from_html: Mais de %{name}
+    s_blog: Blog de %{name}
+    title: Atribuição de autor
   challenge:
     confirm: Continuar
     hint_html: "<strong>Dica:</strong> Não vamos pedir novamente a sua palavra-passe durante a próxima hora."
@@ -1164,6 +1203,9 @@ pt-PT:
       before: 'Antes de continuar, por favor leia cuidadosamente estas notas:'
       caches: O conteúdo que foi armazenado em cache por outras instâncias pode perdurar
       data_removal: As suas publicações e outros dados serão eliminados permanentemente
+      email_change_html: Pode <a href="%{path}">alterar o seu e-mail</a> sem eliminar a sua conta
+      email_contact_html: Se ainda assim não o recebeu, pode enviar um e-mail para <a href="mailto:%{email}">%{email}</a> para obter ajuda
+      email_reconfirmation_html: Se não recebeu a mensagem de e-mail de confirmação, pode <a href="%{path}">solicitá-la novamente</a>
       irreversible: Não será possível restaurar ou reativar sua conta
       more_details_html: Para mais pormenores, leia a <a href="%{terms_path}">política de privacidade</a>.
       username_available: O seu nome de utilizador ficará novamente disponível
@@ -1394,6 +1436,7 @@ pt-PT:
     authentication_methods:
       otp: aplicação de autenticação em duas etapas
       password: palavra-passe
+      sign_in_token: código de segurança de e-mail
       webauthn: chaves de segurança
     description_html: Se vê atividade que não reconhece, considere alterar a sua palavra-passe e ativar a autenticação em duas etapas.
     empty: Sem histórico de autenticação disponível
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 4a9245682d..8d045cfcfe 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -3,6 +3,7 @@ et:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Kaitseb valede omistuste eest.
         discoverable: Su profiili ja avalikke postitusi võidakse Mastodoni erinevates piirkondades esile tõsta või soovitada ning su profiili soovitada teistele kasutajatele.
         display_name: Su täisnimi või naljanimi.
         fields: Su koduleht, sugu, vanus. Mistahes, mida soovid.
@@ -143,6 +144,7 @@ et:
         url: Kuhu sündmused saadetakse
     labels:
       account:
+        attribution_domains_as_text: Luba vaid kindlad veebilehed
         discoverable: Tõsta postitused ja profiil avastamise algoritmides esile
         fields:
           name: Nimetus
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 794c3f4533..90a268f411 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -78,9 +78,11 @@ fr-CA:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+        app_icon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
+        content_cache_retention_period: Tous les messages provenant d'autres serveurs (y compris les partages et les réponses) seront supprimés passé le nombre de jours spécifié, sans tenir compte de l'interaction de l'utilisateur·rice local·e avec ces messages. Cela inclut les messages qu'un·e utilisateur·rice aurait marqué comme signets ou comme favoris. Les mentions privées entre utilisateur·rice·s de différentes instances seront également perdues et impossibles à restaurer. L'utilisation de ce paramètre est destinée à des instances spécifiques et contrevient à de nombreuses attentes des utilisateurs lorsqu'elle est appliquée à des fins d'utilisation ordinaires.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         favicon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         mascot: Remplace l'illustration dans l'interface Web avancée.
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index e29d9f0a94..370f5c1e46 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -78,9 +78,11 @@ fr:
           warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
       form_admin_settings:
         activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+        app_icon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
         bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
         closed_registrations_message: Affiché lorsque les inscriptions sont fermées
+        content_cache_retention_period: Tous les messages provenant d'autres serveurs (y compris les partages et les réponses) seront supprimés passé le nombre de jours spécifié, sans tenir compte de l'interaction de l'utilisateur·rice local·e avec ces messages. Cela inclut les messages qu'un·e utilisateur·rice aurait marqué comme signets ou comme favoris. Les mentions privées entre utilisateur·rice·s de différentes instances seront également perdues et impossibles à restaurer. L'utilisation de ce paramètre est destinée à des instances spécifiques et contrevient à de nombreuses attentes des utilisateurs lorsqu'elle est appliquée à des fins d'utilisation ordinaires.
         custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
         favicon: WEBP, PNG, GIF ou JPG. Remplace la favicon Mastodon par défaut avec une icône personnalisée.
         mascot: Remplace l'illustration dans l'interface Web avancée.
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 7c125b165a..772f996ca6 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -3,6 +3,7 @@ ga:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Cosnaíonn sé ó sannadh bréagach.
         discoverable: Seans go mbeidh do phostálacha poiblí agus do phróifíl le feiceáil nó molta i réimsí éagsúla de Mastodon agus is féidir do phróifíl a mholadh d’úsáideoirí eile.
         display_name: D'ainm iomlán nó d'ainm spraoi.
         fields: Do leathanach baile, forainmneacha, aois, rud ar bith is mian leat.
@@ -143,6 +144,7 @@ ga:
         url: An áit a seolfar imeachtaí chuig
     labels:
       account:
+        attribution_domains_as_text: Ná ceadaigh ach láithreáin ghréasáin ar leith
         discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana
         fields:
           name: Lipéad
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 9b6c156de7..de585c7a21 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -3,6 +3,7 @@ gd:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Dìonadh seo o bhuaidh-aithrisean cearra.
         discoverable: Dh’fhaoidte gun dèid na postaichean poblach ’s a’ phròifil agad a bhrosnachadh no a mholadh ann an caochladh roinnean de Mhastodon agus gun dèid a’ phròifil agad a mholadh do chàch.
         display_name: D’ ainm slàn no spòrsail.
         fields: An duilleag-dhachaigh agad, roimhearan, aois, rud sam bith a thogras tu.
@@ -143,6 +144,7 @@ gd:
         url: Far an dèid na tachartasan a chur
     labels:
       account:
+        attribution_domains_as_text: Na ceadaich ach làraichean-lìnn sònraichte
         discoverable: Brosnaich a’ phròifil is postaichean agad sna h-algairimean rùrachaidh
         fields:
           name: Leubail
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 41f55f183d..5d3a02993b 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -90,6 +90,8 @@ lt:
         timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
         trends_as_landing_page: Rodyti tendencingą turinį atsijungusiems naudotojams ir lankytojams vietoj šio serverio aprašymo. Reikia, kad tendencijos būtų įjungtos.
+      imports:
+        data: CSV failas, eksportuotas iš kito „Mastodon“ serverio.
       invite_request:
         text: Tai padės mums peržiūrėti tavo paraišką
       rule:
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index d96f57058b..4369c3c42b 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -3,6 +3,7 @@ lv:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Aizsargā no nepatiesas piedēvēšanas.
         discoverable: Tavas publiskās ziņas un profils var tikt piedāvāti vai ieteikti dažādās Mastodon vietās, un tavs profils var tikt ieteikts citiem lietotājiem.
         display_name: Tavs pilnais vārds vai tavs joku vārds.
         fields: Tava mājas lapa, vietniekvārdi, vecums, viss, ko vēlies.
@@ -128,6 +129,7 @@ lv:
         name: Tu vari mainīt tikai burtu lielumu, piemēram, lai tie būtu vieglāk lasāmi
       user:
         chosen_languages: Ja ieķeksēts, publiskos laika grafikos tiks parādītas tikai ziņas noteiktajās valodās
+        role: Loma nosaka, kādas lietotājam ir atļaujas.
       user_role:
         color: Krāsa, kas jāizmanto lomai visā lietotāja saskarnē, kā RGB hex formātā
         highlighted: Tas padara lomu publiski redzamu
@@ -140,6 +142,7 @@ lv:
         url: Kur notikumi tiks nosūtīti
     labels:
       account:
+        attribution_domains_as_text: Ļaut tikai noteiktas tīmekļvietnes
         discoverable: Funkcijas profils un ziņas atklāšanas algoritmos
         fields:
           name: Marķējums
@@ -208,6 +211,7 @@ lv:
         setting_default_privacy: Publicēšanas privātums
         setting_default_sensitive: Atļaut atzīmēt multividi kā sensitīvu
         setting_delete_modal: Parādīt apstiprinājuma dialogu pirms ziņas dzēšanas
+        setting_disable_hover_cards: Atspējot profila priekšskatījumu pēc kursora novietošanas
         setting_disable_swiping: Atspējot vilkšanas kustības
         setting_display_media: Multivides rādīšana
         setting_display_media_default: Noklusējums
@@ -239,11 +243,13 @@ lv:
           warn: Paslēpt ar brīdinājumu
       form_admin_settings:
         activity_api_enabled: Publicējiet apkopotu statistiku par lietotāju darbībām API
+        app_icon: Lietotnes ikona
         backups_retention_period: Lietotāja arhīva glabāšanas periods
         bootstrap_timeline_accounts: Vienmēr iesaki šos kontus jaunajiem lietotājiem
         closed_registrations_message: Pielāgots ziņojums, ja reģistrēšanās nav pieejama
         content_cache_retention_period: Attālā satura paturēšanas laika posms
         custom_css: Pielāgots CSS
+        favicon: Favikona
         mascot: Pielāgots talismans (mantots)
         media_cache_retention_period: Multivides kešatmiņas saglabāšanas periods
         peers_api_enabled: Publicēt API atklāto serveru sarakstu
@@ -308,6 +314,7 @@ lv:
         listable: Atļaut šim tēmturim parādīties meklējumos un ieteikumos
         name: Tēmturis
         trendable: Atļaut šim tēmturim parādīties zem tendencēm
+        usable: Ļaut ierakstos vietēji izmantot šo tēmturi
       user:
         role: Loma
         time_zone: Laika josla
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 8bd782c140..1ecd672a97 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -3,6 +3,7 @@ th:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: ปกป้องจากการระบุแหล่งที่มาที่ผิด
         discoverable: อาจแสดงหรือแนะนำโพสต์และโปรไฟล์สาธารณะของคุณในพื้นที่ต่าง ๆ ของ Mastodon และอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้ใช้อื่น ๆ
         display_name: ชื่อเต็มของคุณหรือชื่อแบบสนุกสนานของคุณ
         fields: หน้าแรก, สรรพนาม, อายุของคุณ สิ่งใดก็ตามที่คุณต้องการ
@@ -143,6 +144,7 @@ th:
         url: ที่ซึ่งจะส่งเหตุการณ์ไปยัง
     labels:
       account:
+        attribution_domains_as_text: อนุญาตเฉพาะเว็บไซต์ที่เฉพาะเจาะจงเท่านั้น
         discoverable: แสดงโปรไฟล์และโพสต์ในอัลกอริทึมการค้นพบ
         fields:
           name: ป้ายชื่อ
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index 4e7c8b0a97..eab025c665 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -3,6 +3,7 @@ vi:
   simple_form:
     hints:
       account:
+        attribution_domains_as_text: Bảo vệ khỏi những sự gán ghép sai.
         discoverable: Các tút và hồ sơ công khai của bạn có thể được giới thiệu hoặc đề xuất ở nhiều khu vực khác nhau của Mastodon và hồ sơ của bạn có thể được đề xuất cho những người dùng khác.
         display_name: Tên đầy đủ hoặc biệt danh đều được.
         fields: Trang blog của bạn, nghề nghiệp, tuổi hoặc bất cứ thứ gì.
@@ -143,6 +144,7 @@ vi:
         url: Nơi những sự kiện được gửi đến
     labels:
       account:
+        attribution_domains_as_text: Chỉ cho phép các website đặc biệt
         discoverable: Cho phép khám phá hồ sơ
         fields:
           name: Nhãn
diff --git a/config/locales/th.yml b/config/locales/th.yml
index cbacdfac48..65424f4eb6 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -22,6 +22,7 @@ th:
   admin:
     account_actions:
       action: ทำการกระทำ
+      already_silenced: มีการจำกัดบัญชีนี้ไปแล้ว
       already_suspended: มีการระงับบัญชีนี้ไปแล้ว
       title: ทำการกระทำการกลั่นกรองต่อ %{acct}
     account_moderation_notes:
@@ -1141,6 +1142,12 @@ th:
       view_strikes: ดูการดำเนินการที่ผ่านมาต่อบัญชีของคุณ
     too_fast: ส่งแบบฟอร์มเร็วเกินไป ลองอีกครั้ง
     use_security_key: ใช้กุญแจความปลอดภัย
+  author_attribution:
+    example_title: ข้อความตัวอย่าง
+    hint_html: ควบคุมวิธีที่ให้เครดิตแก่คุณเมื่อมีการแบ่งปันลิงก์ใน Mastodon
+    more_from_html: เพิ่มเติมจาก %{name}
+    s_blog: บล็อกของ %{name}
+    title: การระบุแหล่งที่มาผู้สร้าง
   challenge:
     confirm: ดำเนินการต่อ
     hint_html: "<strong>เคล็ดลับ:</strong> เราจะไม่ถามรหัสผ่านของคุณกับคุณสำหรับชั่วโมงถัดไป"
@@ -1905,6 +1912,7 @@ th:
     instructions_html: คัดลอกแล้ววางโค้ดด้านล่างลงใน HTML ของเว็บไซต์ของคุณ จากนั้นเพิ่มที่อยู่ของเว็บไซต์ของคุณลงในหนึ่งในช่องพิเศษในโปรไฟล์ของคุณจากแท็บ "แก้ไขโปรไฟล์" และบันทึกการเปลี่ยนแปลง
     verification: การตรวจสอบ
     verified_links: ลิงก์ที่ยืนยันแล้วของคุณ
+    website_verification: การตรวจสอบเว็บไซต์
   webauthn_credentials:
     add: เพิ่มกุญแจความปลอดภัยใหม่
     create:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a03b46c911..8f047a2cb7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -22,6 +22,7 @@ vi:
   admin:
     account_actions:
       action: Thực hiện hành động
+      already_silenced: Tài khoản này đã bị hạn chế.
       already_suspended: Tài khoản này đã bị vô hiệu hóa.
       title: Áp đặt kiểm duyệt với %{acct}
     account_moderation_notes:
@@ -1141,6 +1142,12 @@ vi:
       view_strikes: Xem những lần cảnh cáo cũ
     too_fast: Nghi vấn đăng ký spam, xin thử lại.
     use_security_key: Dùng khóa bảo mật
+  author_attribution:
+    example_title: Văn bản mẫu
+    hint_html: Kiểm soát cách bạn được ghi nhận khi chia sẻ liên kết trên Mastodon.
+    more_from_html: Thêm từ %{name}
+    s_blog: "%{name}'s Blog"
+    title: Ghi nhận tác giả
   challenge:
     confirm: Tiếp tục
     hint_html: "<strong>Mẹo:</strong> Chúng tôi sẽ không hỏi lại mật khẩu của bạn sau này."
@@ -1905,6 +1912,7 @@ vi:
     instructions_html: Sao chép và dán mã bên dưới vào mã nguồn trang web của bạn. Sau đó, thêm địa chỉ trang web của bạn vào một trong các trường metadata trên hồ sơ của bạn từ tab "Sửa hồ sơ" và lưu thay đổi.
     verification: Xác minh
     verified_links: Những liên kết bạn đã xác minh
+    website_verification: Xác minh website
   webauthn_credentials:
     add: Thêm khóa bảo mật mới
     create:

From c54cbf7943693f2aa63cf9cb32941a674a7ba63b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 16 Sep 2024 04:56:40 -0400
Subject: [PATCH 69/89] Remove `follow` creation from `ListAccount` fabricator
 (#31902)

---
 spec/fabricators/list_account_fabricator.rb | 6 ++++--
 spec/models/list_account_spec.rb            | 8 +++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/fabricators/list_account_fabricator.rb b/spec/fabricators/list_account_fabricator.rb
index 00dde83cdf..fe5a471209 100644
--- a/spec/fabricators/list_account_fabricator.rb
+++ b/spec/fabricators/list_account_fabricator.rb
@@ -2,6 +2,8 @@
 
 Fabricator(:list_account) do
   list
-  account
-  before_create { |list_account, _| list_account.list.account.follow!(account) }
+
+  initialize_with do
+    resolved_class.new(list: list, account: list.account)
+  end
 end
diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb
index e5aad2affa..b2ec17a563 100644
--- a/spec/models/list_account_spec.rb
+++ b/spec/models/list_account_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe ListAccount do
       let(:list) { Fabricate :list, account: follow.account }
 
       it 'finds and sets the follow with the list account' do
-        list_account = described_class.create list: list, account: follow.target_account
+        list_account = Fabricate :list_account, list: list, account: follow.target_account
         expect(list_account)
           .to have_attributes(
             follow: eq(follow),
@@ -23,7 +23,7 @@ RSpec.describe ListAccount do
       let(:list) { Fabricate :list, account: follow_request.account }
 
       it 'finds and sets the follow request with the list account' do
-        list_account = described_class.create list: list, account: follow_request.target_account
+        list_account = Fabricate :list_account, list: list, account: follow_request.target_account
         expect(list_account)
           .to have_attributes(
             follow: be_nil,
@@ -33,10 +33,8 @@ RSpec.describe ListAccount do
     end
 
     context 'when list owner is the account' do
-      let(:list) { Fabricate :list  }
-
       it 'does not set follow or follow request' do
-        list_account = described_class.create list: list, account: list.account
+        list_account = Fabricate :list_account
         expect(list_account)
           .to have_attributes(
             follow: be_nil,

From d5cf27e667e86b023f60780a4e9cdd5d3d1babfd Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 11:40:18 +0200
Subject: [PATCH 70/89] Add global Regexp timeout (#31928)

---
 config/initializers/regexp.rb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 config/initializers/regexp.rb

diff --git a/config/initializers/regexp.rb b/config/initializers/regexp.rb
new file mode 100644
index 0000000000..a820d2b5d3
--- /dev/null
+++ b/config/initializers/regexp.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# 0.5s is a fairly high timeout, but that should account for slow servers under load
+Regexp.timeout = 0.5 if Regexp.respond_to?(:timeout=)

From c0eda832f3cc0f4009a59836cd4494e9daeb844c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 11:54:03 +0200
Subject: [PATCH 71/89] Convert notification requests actions and reducers to
 Typescript (#31866)

---
 .../mastodon/actions/notification_groups.ts   |   8 +-
 .../mastodon/actions/notification_requests.ts | 234 +++++++++++++
 .../mastodon/actions/notifications.js         | 328 ------------------
 app/javascript/mastodon/api/notifications.ts  |  75 +++-
 .../mastodon/api_types/notifications.ts       |   9 +
 .../components/notification_request.jsx       |   6 +-
 .../features/notifications/request.jsx        |  32 +-
 .../features/notifications/requests.jsx       |  33 +-
 .../mastodon/models/notification_request.ts   |  19 +
 .../reducers/notification_requests.js         | 114 ------
 .../reducers/notification_requests.ts         | 182 ++++++++++
 .../mastodon/store/typed_functions.ts         |  37 +-
 12 files changed, 585 insertions(+), 492 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/notification_requests.ts
 create mode 100644 app/javascript/mastodon/models/notification_request.ts
 delete mode 100644 app/javascript/mastodon/reducers/notification_requests.js
 create mode 100644 app/javascript/mastodon/reducers/notification_requests.ts

diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 2ee46500ab..9d3fc0d425 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -2,7 +2,7 @@ import { createAction } from '@reduxjs/toolkit';
 
 import {
   apiClearNotifications,
-  apiFetchNotifications,
+  apiFetchNotificationGroups,
 } from 'mastodon/api/notifications';
 import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
 import type {
@@ -71,7 +71,7 @@ function dispatchAssociatedRecords(
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',
   async (_params, { getState }) =>
-    apiFetchNotifications({ exclude_types: getExcludedTypes(getState()) }),
+    apiFetchNotificationGroups({ exclude_types: getExcludedTypes(getState()) }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -92,7 +92,7 @@ export const fetchNotifications = createDataLoadingThunk(
 export const fetchNotificationsGap = createDataLoadingThunk(
   'notificationGroups/fetchGap',
   async (params: { gap: NotificationGap }, { getState }) =>
-    apiFetchNotifications({
+    apiFetchNotificationGroups({
       max_id: params.gap.maxId,
       exclude_types: getExcludedTypes(getState()),
     }),
@@ -108,7 +108,7 @@ export const fetchNotificationsGap = createDataLoadingThunk(
 export const pollRecentNotifications = createDataLoadingThunk(
   'notificationGroups/pollRecentNotifications',
   async (_params, { getState }) => {
-    return apiFetchNotifications({
+    return apiFetchNotificationGroups({
       max_id: undefined,
       exclude_types: getExcludedTypes(getState()),
       // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
diff --git a/app/javascript/mastodon/actions/notification_requests.ts b/app/javascript/mastodon/actions/notification_requests.ts
new file mode 100644
index 0000000000..ef9cbef03e
--- /dev/null
+++ b/app/javascript/mastodon/actions/notification_requests.ts
@@ -0,0 +1,234 @@
+import {
+  apiFetchNotificationRequest,
+  apiFetchNotificationRequests,
+  apiFetchNotifications,
+  apiAcceptNotificationRequest,
+  apiDismissNotificationRequest,
+  apiAcceptNotificationRequests,
+  apiDismissNotificationRequests,
+} from 'mastodon/api/notifications';
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+import type {
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+} from 'mastodon/api_types/notifications';
+import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
+import type { AppDispatch, RootState } from 'mastodon/store';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { decreasePendingNotificationsCount } from './notification_policies';
+
+// TODO: refactor with notification_groups
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if (notification.type === 'admin.report') {
+      fetchedAccounts.push(notification.report.target_account);
+    }
+
+    if (notification.type === 'moderation_warning') {
+      fetchedAccounts.push(notification.moderation_warning.target_account);
+    }
+
+    if ('status' in notification && notification.status) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/fetch',
+  async (_params, { getState }) => {
+    let sinceId = undefined;
+
+    if (getState().notificationRequests.items.length > 0) {
+      sinceId = getState().notificationRequests.items[0]?.id;
+    }
+
+    return apiFetchNotificationRequests({
+      since_id: sinceId,
+    });
+  },
+  ({ requests, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatch(importFetchedAccounts(requests.map((request) => request.account)));
+
+    return { requests, next: next?.uri };
+  },
+  {
+    condition: (_params, { getState }) =>
+      !getState().notificationRequests.isLoading,
+  },
+);
+
+export const fetchNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/fetch',
+  async ({ id }: { id: string }) => apiFetchNotificationRequest(id),
+  {
+    condition: ({ id }, { getState }) =>
+      !(
+        getState().notificationRequests.current.item?.id === id ||
+        getState().notificationRequests.current.isLoading
+      ),
+  },
+);
+
+export const expandNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/expand',
+  async (_, { getState }) => {
+    const nextUrl = getState().notificationRequests.next;
+    if (!nextUrl) throw new Error('missing URL');
+
+    return apiFetchNotificationRequests(undefined, nextUrl);
+  },
+  ({ requests, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatch(importFetchedAccounts(requests.map((request) => request.account)));
+
+    return { requests, next: next?.uri };
+  },
+  {
+    condition: (_, { getState }) =>
+      !!getState().notificationRequests.next &&
+      !getState().notificationRequests.isLoading,
+  },
+);
+
+export const fetchNotificationsForRequest = createDataLoadingThunk(
+  'notificationRequest/fetchNotifications',
+  async ({ accountId }: { accountId: string }, { getState }) => {
+    const sinceId =
+      // @ts-expect-error current.notifications.items is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      getState().notificationRequests.current.notifications.items[0]?.get(
+        'id',
+      ) as string | undefined;
+
+    return apiFetchNotifications({
+      since_id: sinceId,
+      account_id: accountId,
+    });
+  },
+  ({ notifications, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications, next: next?.uri };
+  },
+  {
+    condition: ({ accountId }, { getState }) => {
+      const current = getState().notificationRequests.current;
+      return !(
+        current.item?.account_id === accountId &&
+        current.notifications.isLoading
+      );
+    },
+  },
+);
+
+export const expandNotificationsForRequest = createDataLoadingThunk(
+  'notificationRequest/expandNotifications',
+  async (_, { getState }) => {
+    const nextUrl = getState().notificationRequests.current.notifications.next;
+    if (!nextUrl) throw new Error('missing URL');
+
+    return apiFetchNotifications(undefined, nextUrl);
+  },
+  ({ notifications, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications, next: next?.uri };
+  },
+  {
+    condition: ({ accountId }: { accountId: string }, { getState }) => {
+      const url = getState().notificationRequests.current.notifications.next;
+
+      return (
+        !!url &&
+        !getState().notificationRequests.current.notifications.isLoading &&
+        getState().notificationRequests.current.item?.account_id === accountId
+      );
+    },
+  },
+);
+
+const selectNotificationCountForRequest = (state: RootState, id: string) => {
+  const requests = state.notificationRequests.items;
+  const thisRequest = requests.find((request) => request.id === id);
+  return thisRequest ? thisRequest.notifications_count : 0;
+};
+
+export const acceptNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/accept',
+  ({ id }: { id: string }) => apiAcceptNotificationRequest(id),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { id } }) => {
+    const count = selectNotificationCountForRequest(getState(), id);
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const dismissNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/dismiss',
+  ({ id }: { id: string }) => apiDismissNotificationRequest(id),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { id } }) => {
+    const count = selectNotificationCountForRequest(getState(), id);
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const acceptNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/acceptBulk',
+  ({ ids }: { ids: string[] }) => apiAcceptNotificationRequests(ids),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { ids } }) => {
+    const count = ids.reduce(
+      (count, id) => count + selectNotificationCountForRequest(getState(), id),
+      0,
+    );
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const dismissNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/dismissBulk',
+  ({ ids }: { ids: string[] }) => apiDismissNotificationRequests(ids),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { ids } }) => {
+    const count = ids.reduce(
+      (count, id) => count + selectNotificationCountForRequest(getState(), id),
+      0,
+    );
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index f5105d460f..14072562d4 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -18,7 +18,6 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { submitMarkers } from './markers';
-import { decreasePendingNotificationsCount } from './notification_policies';
 import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
@@ -44,26 +43,6 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
-export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
-export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
-export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
-
-export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST';
-export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS';
-export const NOTIFICATION_REQUESTS_EXPAND_FAIL    = 'NOTIFICATION_REQUESTS_EXPAND_FAIL';
-
-export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST';
-export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS';
-export const NOTIFICATION_REQUEST_FETCH_FAIL    = 'NOTIFICATION_REQUEST_FETCH_FAIL';
-
-export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST';
-export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS';
-export const NOTIFICATION_REQUEST_ACCEPT_FAIL    = 'NOTIFICATION_REQUEST_ACCEPT_FAIL';
-
-export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST';
-export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
-export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
-
 export const NOTIFICATION_REQUESTS_ACCEPT_REQUEST = 'NOTIFICATION_REQUESTS_ACCEPT_REQUEST';
 export const NOTIFICATION_REQUESTS_ACCEPT_SUCCESS = 'NOTIFICATION_REQUESTS_ACCEPT_SUCCESS';
 export const NOTIFICATION_REQUESTS_ACCEPT_FAIL    = 'NOTIFICATION_REQUESTS_ACCEPT_FAIL';
@@ -72,14 +51,6 @@ export const NOTIFICATION_REQUESTS_DISMISS_REQUEST = 'NOTIFICATION_REQUESTS_DISM
 export const NOTIFICATION_REQUESTS_DISMISS_SUCCESS = 'NOTIFICATION_REQUESTS_DISMISS_SUCCESS';
 export const NOTIFICATION_REQUESTS_DISMISS_FAIL    = 'NOTIFICATION_REQUESTS_DISMISS_FAIL';
 
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
-
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST';
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
-
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
@@ -93,12 +64,6 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
   }
 };
 
-const selectNotificationCountForRequest = (state, id) => {
-  const requests = state.getIn(['notificationRequests', 'items']);
-  const thisRequest = requests.find(request => request.get('id') === id);
-  return thisRequest ? thisRequest.get('notifications_count') : 0;
-};
-
 export const loadPending = () => ({
   type: NOTIFICATIONS_LOAD_PENDING,
 });
@@ -343,296 +308,3 @@ export function setBrowserPermission (value) {
     value,
   };
 }
-
-export const fetchNotificationRequests = () => (dispatch, getState) => {
-  const params = {};
-
-  if (getState().getIn(['notificationRequests', 'isLoading'])) {
-    return;
-  }
-
-  if (getState().getIn(['notificationRequests', 'items'])?.size > 0) {
-    params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']);
-  }
-
-  dispatch(fetchNotificationRequestsRequest());
-
-  api().get('/api/v1/notifications/requests', { params }).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-    dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
-  }).catch(err => {
-    dispatch(fetchNotificationRequestsFail(err));
-  });
-};
-
-export const fetchNotificationRequestsRequest = () => ({
-  type: NOTIFICATION_REQUESTS_FETCH_REQUEST,
-});
-
-export const fetchNotificationRequestsSuccess = (requests, next) => ({
-  type: NOTIFICATION_REQUESTS_FETCH_SUCCESS,
-  requests,
-  next,
-});
-
-export const fetchNotificationRequestsFail = error => ({
-  type: NOTIFICATION_REQUESTS_FETCH_FAIL,
-  error,
-});
-
-export const expandNotificationRequests = () => (dispatch, getState) => {
-  const url = getState().getIn(['notificationRequests', 'next']);
-
-  if (!url || getState().getIn(['notificationRequests', 'isLoading'])) {
-    return;
-  }
-
-  dispatch(expandNotificationRequestsRequest());
-
-  api().get(url).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-    dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(expandNotificationRequestsFail(err));
-  });
-};
-
-export const expandNotificationRequestsRequest = () => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_REQUEST,
-});
-
-export const expandNotificationRequestsSuccess = (requests, next) => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
-  requests,
-  next,
-});
-
-export const expandNotificationRequestsFail = error => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_FAIL,
-  error,
-});
-
-export const fetchNotificationRequest = id => (dispatch, getState) => {
-  const current = getState().getIn(['notificationRequests', 'current']);
-
-  if (current.getIn(['item', 'id']) === id || current.get('isLoading')) {
-    return;
-  }
-
-  dispatch(fetchNotificationRequestRequest(id));
-
-  api().get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
-    dispatch(fetchNotificationRequestSuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationRequestFail(id, err));
-  });
-};
-
-export const fetchNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_FETCH_REQUEST,
-  id,
-});
-
-export const fetchNotificationRequestSuccess = request => ({
-  type: NOTIFICATION_REQUEST_FETCH_SUCCESS,
-  request,
-});
-
-export const fetchNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_FETCH_FAIL,
-  id,
-  error,
-});
-
-export const acceptNotificationRequest = (id) => (dispatch, getState) => {
-  const count = selectNotificationCountForRequest(getState(), id);
-  dispatch(acceptNotificationRequestRequest(id));
-
-  api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
-    dispatch(acceptNotificationRequestSuccess(id));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(acceptNotificationRequestFail(id, err));
-  });
-};
-
-export const acceptNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_REQUEST,
-  id,
-});
-
-export const acceptNotificationRequestSuccess = id => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS,
-  id,
-});
-
-export const acceptNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_FAIL,
-  id,
-  error,
-});
-
-export const dismissNotificationRequest = (id) => (dispatch, getState) => {
-  const count = selectNotificationCountForRequest(getState(), id);
-  dispatch(dismissNotificationRequestRequest(id));
-
-  api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
-    dispatch(dismissNotificationRequestSuccess(id));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(dismissNotificationRequestFail(id, err));
-  });
-};
-
-export const dismissNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_DISMISS_REQUEST,
-  id,
-});
-
-export const dismissNotificationRequestSuccess = id => ({
-  type: NOTIFICATION_REQUEST_DISMISS_SUCCESS,
-  id,
-});
-
-export const dismissNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_DISMISS_FAIL,
-  id,
-  error,
-});
-
-export const acceptNotificationRequests = (ids) => (dispatch, getState) => {
-  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
-  dispatch(acceptNotificationRequestsRequest(ids));
-
-  api().post(`/api/v1/notifications/requests/accept`, { id: ids }).then(() => {
-    dispatch(acceptNotificationRequestsSuccess(ids));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(acceptNotificationRequestFail(ids, err));
-  });
-};
-
-export const acceptNotificationRequestsRequest = ids => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
-  ids,
-});
-
-export const acceptNotificationRequestsSuccess = ids => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_SUCCESS,
-  ids,
-});
-
-export const acceptNotificationRequestsFail = (ids, error) => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_FAIL,
-  ids,
-  error,
-});
-
-export const dismissNotificationRequests = (ids) => (dispatch, getState) => {
-  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
-  dispatch(acceptNotificationRequestsRequest(ids));
-
-  api().post(`/api/v1/notifications/requests/dismiss`, { id: ids }).then(() => {
-    dispatch(dismissNotificationRequestsSuccess(ids));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(dismissNotificationRequestFail(ids, err));
-  });
-};
-
-export const dismissNotificationRequestsRequest = ids => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_REQUEST,
-  ids,
-});
-
-export const dismissNotificationRequestsSuccess = ids => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_SUCCESS,
-  ids,
-});
-
-export const dismissNotificationRequestsFail = (ids, error) => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_FAIL,
-  ids,
-  error,
-});
-
-export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
-  const current = getState().getIn(['notificationRequests', 'current']);
-  const params = { account_id: accountId };
-
-  if (current.getIn(['item', 'account']) === accountId) {
-    if (current.getIn(['notifications', 'isLoading'])) {
-      return;
-    }
-
-    if (current.getIn(['notifications', 'items'])?.size > 0) {
-      params.since_id = current.getIn(['notifications', 'items', 0, 'id']);
-    }
-  }
-
-  dispatch(fetchNotificationsForRequestRequest());
-
-  api().get('/api/v1/notifications', { params }).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
-    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
-    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
-
-    dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(fetchNotificationsForRequestFail(err));
-  });
-};
-
-export const fetchNotificationsForRequestRequest = () => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
-});
-
-export const fetchNotificationsForRequestSuccess = (notifications, next) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
-  notifications,
-  next,
-});
-
-export const fetchNotificationsForRequestFail = (error) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
-  error,
-});
-
-export const expandNotificationsForRequest = () => (dispatch, getState) => {
-  const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']);
-
-  if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) {
-    return;
-  }
-
-  dispatch(expandNotificationsForRequestRequest());
-
-  api().get(url).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
-    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
-    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
-
-    dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(expandNotificationsForRequestFail(err));
-  });
-};
-
-export const expandNotificationsForRequestRequest = () => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
-});
-
-export const expandNotificationsForRequestSuccess = (notifications, next) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
-  notifications,
-  next,
-});
-
-export const expandNotificationsForRequestFail = (error) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
-  error,
-});
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
index cb07e4114c..e34dc85bb0 100644
--- a/app/javascript/mastodon/api/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -1,7 +1,36 @@
-import api, { apiRequest, getLinks } from 'mastodon/api';
-import type { ApiNotificationGroupsResultJSON } from 'mastodon/api_types/notifications';
+import api, {
+  apiRequest,
+  getLinks,
+  apiRequestGet,
+  apiRequestPost,
+} from 'mastodon/api';
+import type {
+  ApiNotificationGroupsResultJSON,
+  ApiNotificationRequestJSON,
+  ApiNotificationJSON,
+} from 'mastodon/api_types/notifications';
 
-export const apiFetchNotifications = async (params?: {
+export const apiFetchNotifications = async (
+  params?: {
+    account_id?: string;
+    since_id?: string;
+  },
+  url?: string,
+) => {
+  const response = await api().request<ApiNotificationJSON[]>({
+    method: 'GET',
+    url: url ?? '/api/v1/notifications',
+    params,
+  });
+
+  return {
+    notifications: response.data,
+    links: getLinks(response),
+  };
+};
+
+export const apiFetchNotificationGroups = async (params?: {
+  url?: string;
   exclude_types?: string[];
   max_id?: string;
   since_id?: string;
@@ -24,3 +53,43 @@ export const apiFetchNotifications = async (params?: {
 
 export const apiClearNotifications = () =>
   apiRequest<undefined>('POST', 'v1/notifications/clear');
+
+export const apiFetchNotificationRequests = async (
+  params?: {
+    since_id?: string;
+  },
+  url?: string,
+) => {
+  const response = await api().request<ApiNotificationRequestJSON[]>({
+    method: 'GET',
+    url: url ?? '/api/v1/notifications/requests',
+    params,
+  });
+
+  return {
+    requests: response.data,
+    links: getLinks(response),
+  };
+};
+
+export const apiFetchNotificationRequest = async (id: string) => {
+  return apiRequestGet<ApiNotificationRequestJSON>(
+    `v1/notifications/requests/${id}`,
+  );
+};
+
+export const apiAcceptNotificationRequest = async (id: string) => {
+  return apiRequestPost(`v1/notifications/requests/${id}/accept`);
+};
+
+export const apiDismissNotificationRequest = async (id: string) => {
+  return apiRequestPost(`v1/notifications/requests/${id}/dismiss`);
+};
+
+export const apiAcceptNotificationRequests = async (id: string[]) => {
+  return apiRequestPost('v1/notifications/requests/accept', { id });
+};
+
+export const apiDismissNotificationRequests = async (id: string[]) => {
+  return apiRequestPost('v1/notifications/dismiss/dismiss', { id });
+};
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index 4ab9a4c90a..28ba7eb5c2 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -149,3 +149,12 @@ export interface ApiNotificationGroupsResultJSON {
   statuses: ApiStatusJSON[];
   notification_groups: ApiNotificationGroupJSON[];
 }
+
+export interface ApiNotificationRequestJSON {
+  id: string;
+  created_at: string;
+  updated_at: string;
+  notifications_count: string;
+  account: ApiAccountJSON;
+  last_status?: ApiStatusJSON;
+}
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
index 2f378942bc..626929ae50 100644
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -12,7 +12,7 @@ import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { initBlockModal } from 'mastodon/actions/blocks';
 import { initMuteModal } from 'mastodon/actions/mutes';
-import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notification_requests';
 import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
 import { CheckBox } from 'mastodon/components/check_box';
@@ -40,11 +40,11 @@ export const NotificationRequest = ({ id, accountId, notificationsCount, checked
   const { push: historyPush } = useHistory();
 
   const handleDismiss = useCallback(() => {
-    dispatch(dismissNotificationRequest(id));
+    dispatch(dismissNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleAccept = useCallback(() => {
-    dispatch(acceptNotificationRequest(id));
+    dispatch(acceptNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleMute = useCallback(() => {
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index 30ec004e70..a7e5180a4f 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -10,7 +10,13 @@ import { useSelector, useDispatch } from 'react-redux';
 import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/actions/notifications';
+import {
+  fetchNotificationRequest,
+  fetchNotificationsForRequest,
+  expandNotificationsForRequest,
+  acceptNotificationRequest,
+  dismissNotificationRequest,
+} from 'mastodon/actions/notification_requests';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -44,28 +50,28 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
   const columnRef = useRef();
   const intl = useIntl();
   const dispatch = useDispatch();
-  const notificationRequest = useSelector(state => state.getIn(['notificationRequests', 'current', 'item', 'id']) === id ? state.getIn(['notificationRequests', 'current', 'item']) : null);
-  const accountId = notificationRequest?.get('account');
+  const notificationRequest = useSelector(state => state.notificationRequests.current.item?.id === id ? state.notificationRequests.current.item : null);
+  const accountId = notificationRequest?.account_id;
   const account = useSelector(state => state.getIn(['accounts', accountId]));
-  const notifications = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'items']));
-  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'isLoading']));
-  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'current', 'notifications', 'next']));
-  const removed = useSelector(state => state.getIn(['notificationRequests', 'current', 'removed']));
+  const notifications = useSelector(state => state.notificationRequests.current.notifications.items);
+  const isLoading = useSelector(state => state.notificationRequests.current.notifications.isLoading);
+  const hasMore = useSelector(state => !!state.notificationRequests.current.notifications.next);
+  const removed = useSelector(state => state.notificationRequests.current.removed);
 
   const handleHeaderClick = useCallback(() => {
     columnRef.current?.scrollTop();
   }, [columnRef]);
 
   const handleLoadMore = useCallback(() => {
-    dispatch(expandNotificationsForRequest());
-  }, [dispatch]);
+    dispatch(expandNotificationsForRequest({ accountId }));
+  }, [dispatch, accountId]);
 
   const handleDismiss = useCallback(() => {
-    dispatch(dismissNotificationRequest(id));
+    dispatch(dismissNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleAccept = useCallback(() => {
-    dispatch(acceptNotificationRequest(id));
+    dispatch(acceptNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleMoveUp = useCallback(id => {
@@ -79,12 +85,12 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
   }, [columnRef, notifications]);
 
   useEffect(() => {
-    dispatch(fetchNotificationRequest(id));
+    dispatch(fetchNotificationRequest({ id }));
   }, [dispatch, id]);
 
   useEffect(() => {
     if (accountId) {
-      dispatch(fetchNotificationsForRequest(accountId));
+      dispatch(fetchNotificationsForRequest({ accountId }));
     }
   }, [dispatch, accountId]);
 
diff --git a/app/javascript/mastodon/features/notifications/requests.jsx b/app/javascript/mastodon/features/notifications/requests.jsx
index 622a171fd3..ccaed312b4 100644
--- a/app/javascript/mastodon/features/notifications/requests.jsx
+++ b/app/javascript/mastodon/features/notifications/requests.jsx
@@ -11,7 +11,12 @@ import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?rea
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'mastodon/actions/modal';
-import { fetchNotificationRequests, expandNotificationRequests, acceptNotificationRequests, dismissNotificationRequests } from 'mastodon/actions/notifications';
+import {
+  fetchNotificationRequests,
+  expandNotificationRequests,
+  acceptNotificationRequests,
+  dismissNotificationRequests,
+} from 'mastodon/actions/notification_requests';
 import { changeSetting } from 'mastodon/actions/settings';
 import { CheckBox } from 'mastodon/components/check_box';
 import Column from 'mastodon/components/column';
@@ -84,7 +89,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
         message: intl.formatMessage(messages.confirmAcceptMultipleMessage, { count: selectedItems.length }),
         confirm: intl.formatMessage(messages.confirmAcceptMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
-          dispatch(acceptNotificationRequests(selectedItems)),
+          dispatch(acceptNotificationRequests({ ids: selectedItems })),
       },
     }));
   }, [dispatch, intl, selectedItems]);
@@ -97,7 +102,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
         message: intl.formatMessage(messages.confirmDismissMultipleMessage, { count: selectedItems.length }),
         confirm: intl.formatMessage(messages.confirmDismissMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
-          dispatch(dismissNotificationRequests(selectedItems)),
+          dispatch(dismissNotificationRequests({ ids: selectedItems })),
       },
     }));
   }, [dispatch, intl, selectedItems]);
@@ -161,9 +166,9 @@ export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
   const dispatch = useDispatch();
-  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'isLoading']));
-  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
-  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
+  const isLoading = useSelector(state => state.notificationRequests.isLoading);
+  const notificationRequests = useSelector(state => state.notificationRequests.items);
+  const hasMore = useSelector(state => !!state.notificationRequests.next);
 
   const [selectionMode, setSelectionMode] = useState(false);
   const [checkedRequestIds, setCheckedRequestIds] = useState([]);
@@ -182,7 +187,7 @@ export const NotificationRequests = ({ multiColumn }) => {
       else
         ids.push(id);
 
-      setSelectAllChecked(ids.length === notificationRequests.size);
+      setSelectAllChecked(ids.length === notificationRequests.length);
 
       return [...ids];
     });
@@ -193,7 +198,7 @@ export const NotificationRequests = ({ multiColumn }) => {
       if(checked)
         setCheckedRequestIds([]);
       else
-        setCheckedRequestIds(notificationRequests.map(request => request.get('id')).toArray());
+        setCheckedRequestIds(notificationRequests.map(request => request.id));
 
       return !checked;
     });
@@ -217,7 +222,7 @@ export const NotificationRequests = ({ multiColumn }) => {
         multiColumn={multiColumn}
         showBackButton
         appendContent={
-          notificationRequests.size > 0 && (
+          notificationRequests.length > 0 && (
             <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />
           )}
       >
@@ -236,12 +241,12 @@ export const NotificationRequests = ({ multiColumn }) => {
       >
         {notificationRequests.map(request => (
           <NotificationRequest
-            key={request.get('id')}
-            id={request.get('id')}
-            accountId={request.get('account')}
-            notificationsCount={request.get('notifications_count')}
+            key={request.id}
+            id={request.id}
+            accountId={request.account_id}
+            notificationsCount={request.notifications_count}
             showCheckbox={selectionMode}
-            checked={checkedRequestIds.includes(request.get('id'))}
+            checked={checkedRequestIds.includes(request.id)}
             toggleCheck={handleCheck}
           />
         ))}
diff --git a/app/javascript/mastodon/models/notification_request.ts b/app/javascript/mastodon/models/notification_request.ts
new file mode 100644
index 0000000000..bd98d213d4
--- /dev/null
+++ b/app/javascript/mastodon/models/notification_request.ts
@@ -0,0 +1,19 @@
+import type { ApiNotificationRequestJSON } from 'mastodon/api_types/notifications';
+
+export interface NotificationRequest
+  extends Omit<ApiNotificationRequestJSON, 'account' | 'notifications_count'> {
+  account_id: string;
+  notifications_count: number;
+}
+
+export function createNotificationRequestFromJSON(
+  requestJSON: ApiNotificationRequestJSON,
+): NotificationRequest {
+  const { account, notifications_count, ...request } = requestJSON;
+
+  return {
+    account_id: account.id,
+    notifications_count: +notifications_count,
+    ...request,
+  };
+}
diff --git a/app/javascript/mastodon/reducers/notification_requests.js b/app/javascript/mastodon/reducers/notification_requests.js
deleted file mode 100644
index f73c641965..0000000000
--- a/app/javascript/mastodon/reducers/notification_requests.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-
-import { blockAccountSuccess, muteAccountSuccess } from 'mastodon/actions/accounts';
-import {
-  NOTIFICATION_REQUESTS_EXPAND_REQUEST,
-  NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
-  NOTIFICATION_REQUESTS_EXPAND_FAIL,
-  NOTIFICATION_REQUESTS_FETCH_REQUEST,
-  NOTIFICATION_REQUESTS_FETCH_SUCCESS,
-  NOTIFICATION_REQUESTS_FETCH_FAIL,
-  NOTIFICATION_REQUEST_FETCH_REQUEST,
-  NOTIFICATION_REQUEST_FETCH_SUCCESS,
-  NOTIFICATION_REQUEST_FETCH_FAIL,
-  NOTIFICATION_REQUEST_ACCEPT_REQUEST,
-  NOTIFICATION_REQUEST_DISMISS_REQUEST,
-  NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
-  NOTIFICATION_REQUESTS_DISMISS_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
-} from 'mastodon/actions/notifications';
-
-import { notificationToMap } from './notifications';
-
-const initialState = ImmutableMap({
-  items: ImmutableList(),
-  isLoading: false,
-  next: null,
-  current: ImmutableMap({
-    isLoading: false,
-    item: null,
-    removed: false,
-    notifications: ImmutableMap({
-      items: ImmutableList(),
-      isLoading: false,
-      next: null,
-    }),
-  }),
-});
-
-const normalizeRequest = request => fromJS({
-  ...request,
-  account: request.account.id,
-});
-
-const removeRequest = (state, id) => {
-  if (state.getIn(['current', 'item', 'id']) === id) {
-    state = state.setIn(['current', 'removed'], true);
-  }
-
-  return state.update('items', list => list.filterNot(item => item.get('id') === id));
-};
-
-const removeRequestByAccount = (state, account_id) => {
-  if (state.getIn(['current', 'item', 'account']) === account_id) {
-    state = state.setIn(['current', 'removed'], true);
-  }
-
-  return state.update('items', list => list.filterNot(item => item.get('account') === account_id));
-};
-
-export const notificationRequestsReducer = (state = initialState, action) => {
-  switch(action.type) {
-  case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
-    return state.withMutations(map => {
-      map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
-      map.set('isLoading', false);
-      map.update('next', next => next ?? action.next);
-    });
-  case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
-    return state.withMutations(map => {
-      map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
-      map.set('isLoading', false);
-      map.set('next', action.next);
-    });
-  case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
-  case NOTIFICATION_REQUESTS_FETCH_REQUEST:
-    return state.set('isLoading', true);
-  case NOTIFICATION_REQUESTS_EXPAND_FAIL:
-  case NOTIFICATION_REQUESTS_FETCH_FAIL:
-    return state.set('isLoading', false);
-  case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
-  case NOTIFICATION_REQUEST_DISMISS_REQUEST:
-    return removeRequest(state, action.id);
-  case NOTIFICATION_REQUESTS_ACCEPT_REQUEST:
-  case NOTIFICATION_REQUESTS_DISMISS_REQUEST:
-    return action.ids.reduce((state, id) => removeRequest(state, id), state);
-  case blockAccountSuccess.type:
-    return removeRequestByAccount(state, action.payload.relationship.id);
-  case muteAccountSuccess.type:
-    return action.payload.relationship.muting_notifications ? removeRequestByAccount(state, action.payload.relationship.id) : state;
-  case NOTIFICATION_REQUEST_FETCH_REQUEST:
-    return state.set('current', initialState.get('current').set('isLoading', true));
-  case NOTIFICATION_REQUEST_FETCH_SUCCESS:
-    return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
-  case NOTIFICATION_REQUEST_FETCH_FAIL:
-    return state.update('current', map => map.set('isLoading', false));
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
-    return state.setIn(['current', 'notifications', 'isLoading'], true);
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
-    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
-    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
-    return state.setIn(['current', 'notifications', 'isLoading'], false);
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/mastodon/reducers/notification_requests.ts b/app/javascript/mastodon/reducers/notification_requests.ts
new file mode 100644
index 0000000000..1ca92d9990
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_requests.ts
@@ -0,0 +1,182 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  blockAccountSuccess,
+  muteAccountSuccess,
+} from 'mastodon/actions/accounts';
+import {
+  fetchNotificationRequests,
+  expandNotificationRequests,
+  fetchNotificationRequest,
+  fetchNotificationsForRequest,
+  expandNotificationsForRequest,
+  acceptNotificationRequest,
+  dismissNotificationRequest,
+  acceptNotificationRequests,
+  dismissNotificationRequests,
+} from 'mastodon/actions/notification_requests';
+import type { NotificationRequest } from 'mastodon/models/notification_request';
+import { createNotificationRequestFromJSON } from 'mastodon/models/notification_request';
+
+import { notificationToMap } from './notifications';
+
+interface NotificationsListState {
+  items: unknown[]; // TODO
+  isLoading: boolean;
+  next: string | null;
+}
+
+interface CurrentNotificationRequestState {
+  item: NotificationRequest | null;
+  isLoading: boolean;
+  removed: boolean;
+  notifications: NotificationsListState;
+}
+
+interface NotificationRequestsState {
+  items: NotificationRequest[];
+  isLoading: boolean;
+  next: string | null;
+  current: CurrentNotificationRequestState;
+}
+
+const initialState: NotificationRequestsState = {
+  items: [],
+  isLoading: false,
+  next: null,
+  current: {
+    item: null,
+    isLoading: false,
+    removed: false,
+    notifications: {
+      isLoading: false,
+      items: [],
+      next: null,
+    },
+  },
+};
+
+const removeRequest = (state: NotificationRequestsState, id: string) => {
+  if (state.current.item?.id === id) {
+    state.current.removed = true;
+  }
+
+  state.items = state.items.filter((item) => item.id !== id);
+};
+
+const removeRequestByAccount = (
+  state: NotificationRequestsState,
+  account_id: string,
+) => {
+  if (state.current.item?.account_id === account_id) {
+    state.current.removed = true;
+  }
+
+  state.items = state.items.filter((item) => item.account_id !== account_id);
+};
+
+export const notificationRequestsReducer =
+  createReducer<NotificationRequestsState>(initialState, (builder) => {
+    builder
+      .addCase(fetchNotificationRequests.fulfilled, (state, action) => {
+        state.items = action.payload.requests
+          .map(createNotificationRequestFromJSON)
+          .concat(state.items);
+        state.isLoading = false;
+        state.next ??= action.payload.next ?? null;
+      })
+      .addCase(expandNotificationRequests.fulfilled, (state, action) => {
+        state.items = state.items.concat(
+          action.payload.requests.map(createNotificationRequestFromJSON),
+        );
+        state.isLoading = false;
+        state.next = action.payload.next ?? null;
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeRequestByAccount(state, action.payload.relationship.id);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeRequestByAccount(state, action.payload.relationship.id);
+      })
+      .addCase(fetchNotificationRequest.pending, (state) => {
+        state.current = { ...initialState.current, isLoading: true };
+      })
+      .addCase(fetchNotificationRequest.rejected, (state) => {
+        state.current.isLoading = false;
+      })
+      .addCase(fetchNotificationRequest.fulfilled, (state, action) => {
+        state.current.isLoading = false;
+        state.current.item = createNotificationRequestFromJSON(action.payload);
+      })
+      .addCase(fetchNotificationsForRequest.fulfilled, (state, action) => {
+        state.current.notifications.isLoading = false;
+        state.current.notifications.items.unshift(
+          ...action.payload.notifications.map(notificationToMap),
+        );
+        state.current.notifications.next ??= action.payload.next ?? null;
+      })
+      .addCase(expandNotificationsForRequest.fulfilled, (state, action) => {
+        state.current.notifications.isLoading = false;
+        state.current.notifications.items.push(
+          ...action.payload.notifications.map(notificationToMap),
+        );
+        state.current.notifications.next = action.payload.next ?? null;
+      })
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationRequests.pending,
+          expandNotificationRequests.pending,
+        ),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationRequests.rejected,
+          expandNotificationRequests.rejected,
+        ),
+        (state) => {
+          state.isLoading = false;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          acceptNotificationRequest.pending,
+          dismissNotificationRequest.pending,
+        ),
+        (state, action) => {
+          removeRequest(state, action.meta.arg.id);
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          acceptNotificationRequests.pending,
+          dismissNotificationRequests.pending,
+        ),
+        (state, action) => {
+          action.meta.arg.ids.forEach((id) => {
+            removeRequest(state, id);
+          });
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationsForRequest.pending,
+          expandNotificationsForRequest.pending,
+        ),
+        (state) => {
+          state.current.notifications.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationsForRequest.rejected,
+          expandNotificationsForRequest.rejected,
+        ),
+        (state) => {
+          state.current.notifications.isLoading = false;
+        },
+      );
+  });
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index 544d619682..9fcc90c61b 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -33,8 +33,12 @@ interface AppThunkConfig {
 }
 type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
 
-interface AppThunkOptions {
+interface AppThunkOptions<Arg> {
   useLoadingBar?: boolean;
+  condition?: (
+    arg: Arg,
+    { getState }: { getState: AppThunkApi['getState'] },
+  ) => boolean;
 }
 
 const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
@@ -42,7 +46,7 @@ const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
 export function createThunk<Arg = void, Returned = void>(
   name: string,
   creator: (arg: Arg, api: AppThunkApi) => Returned | Promise<Returned>,
-  options: AppThunkOptions = {},
+  options: AppThunkOptions<Arg> = {},
 ) {
   return createBaseAsyncThunk(
     name,
@@ -70,6 +74,7 @@ export function createThunk<Arg = void, Returned = void>(
         if (options.useLoadingBar) return { useLoadingBar: true };
         return {};
       },
+      condition: options.condition,
     },
   );
 }
@@ -96,7 +101,7 @@ type ArgsType = Record<string, unknown> | undefined;
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
@@ -104,17 +109,19 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, DiscardLoadData>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<Args, LoadDataResult, void>,
-  thunkOptions?: AppThunkOptions,
+  onDataOrThunkOptions?:
+    | AppThunkOptions<Args>
+    | OnData<Args, LoadDataResult, void>,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when there is an `onData` method returning something
@@ -126,9 +133,9 @@ export function createDataLoadingThunk<
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, Returned>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, Returned>>;
 
 /**
@@ -154,6 +161,7 @@ export function createDataLoadingThunk<
  * @param maybeThunkOptions
  *   Additional Mastodon specific options for the thunk. Currently supports:
  *   - `useLoadingBar` to display a loading bar while this action is pending. Defaults to true.
+ *   - `condition` is passed to `createAsyncThunk` (https://redux-toolkit.js.org/api/createAsyncThunk#canceling-before-execution)
  * @returns The created thunk
  */
 export function createDataLoadingThunk<
@@ -164,12 +172,12 @@ export function createDataLoadingThunk<
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, Returned>,
-  maybeThunkOptions?: AppThunkOptions,
+  maybeThunkOptions?: AppThunkOptions<Args>,
 ) {
   let onData: OnData<Args, LoadDataResult, Returned> | undefined;
-  let thunkOptions: AppThunkOptions | undefined;
+  let thunkOptions: AppThunkOptions<Args> | undefined;
 
   if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
   else if (typeof onDataOrThunkOptions === 'object')
@@ -203,6 +211,9 @@ export function createDataLoadingThunk<
         return undefined as Returned;
       else return result;
     },
-    { useLoadingBar: thunkOptions?.useLoadingBar ?? true },
+    {
+      useLoadingBar: thunkOptions?.useLoadingBar ?? true,
+      condition: thunkOptions?.condition,
+    },
   );
 }

From efb0e2c34b2c2921ac0c0b999d99384882667d6c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 16 Sep 2024 14:08:37 +0200
Subject: [PATCH 72/89] Fix horizontal scrollbar on who to follow carousel in
 web UI (#31912)

---
 app/javascript/styles/mastodon/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a53eef52c4..3a2564df45 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -10234,6 +10234,7 @@ noscript {
       scroll-padding: 16px;
       scroll-behavior: smooth;
       overflow-x: scroll;
+      scrollbar-width: none;
 
       &__card {
         background: var(--background-color);

From e0648a916ab81925545504173bf4f43ec64d4f3c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 14:10:02 +0200
Subject: [PATCH 73/89] Rename `/api/v2_alpha/notifications*` to
 `/api/v2/notifications*` (#31840)

---
 .../notifications/accounts_controller.rb      |   6 +-
 .../notifications_controller.rb               |  12 +-
 app/javascript/mastodon/api/notifications.ts  |   2 +-
 app/serializers/rest/instance_serializer.rb   |   4 +-
 config/routes/api.rb                          |  32 +-
 lib/mastodon/version.rb                       |   6 +
 .../notifications/accounts_spec.rb            |   8 +-
 spec/requests/api/v2/notifications_spec.rb    | 343 ++++++++++++++++++
 .../api/v2_alpha/notifications_spec.rb        |  14 +-
 9 files changed, 391 insertions(+), 36 deletions(-)
 rename app/controllers/api/{v2_alpha => v2}/notifications/accounts_controller.rb (77%)
 rename app/controllers/api/{v2_alpha => v2}/notifications_controller.rb (89%)
 rename spec/requests/api/{v2_alpha => v2}/notifications/accounts_spec.rb (84%)
 create mode 100644 spec/requests/api/v2/notifications_spec.rb

diff --git a/app/controllers/api/v2_alpha/notifications/accounts_controller.rb b/app/controllers/api/v2/notifications/accounts_controller.rb
similarity index 77%
rename from app/controllers/api/v2_alpha/notifications/accounts_controller.rb
rename to app/controllers/api/v2/notifications/accounts_controller.rb
index 9933b63373..771e966388 100644
--- a/app/controllers/api/v2_alpha/notifications/accounts_controller.rb
+++ b/app/controllers/api/v2/notifications/accounts_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::V2Alpha::Notifications::AccountsController < Api::BaseController
+class Api::V2::Notifications::AccountsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:notifications' }
   before_action :require_user!
   before_action :set_notifications!
@@ -33,11 +33,11 @@ class Api::V2Alpha::Notifications::AccountsController < Api::BaseController
   end
 
   def next_path
-    api_v2_alpha_notification_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
+    api_v2_notification_accounts_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
 
   def prev_path
-    api_v2_alpha_notification_accounts_url pagination_params(min_id: pagination_since_id) unless @paginated_notifications.empty?
+    api_v2_notification_accounts_url pagination_params(min_id: pagination_since_id) unless @paginated_notifications.empty?
   end
 
   def pagination_collection
diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2/notifications_controller.rb
similarity index 89%
rename from app/controllers/api/v2_alpha/notifications_controller.rb
rename to app/controllers/api/v2/notifications_controller.rb
index e8aa0b9e49..c070c0e5e7 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2/notifications_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::V2Alpha::NotificationsController < Api::BaseController
+class Api::V2::NotificationsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss]
   before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss]
   before_action :require_user!
@@ -21,7 +21,7 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
       ActiveRecord::Associations::Preloader.new(records: @presenter.accounts, associations: [:account_stat, { user: :role }]).call
     end
 
-    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
+    MastodonOTELTracer.in_span('Api::V2::NotificationsController#index rendering') do |span|
       statuses = @grouped_notifications.filter_map { |group| group.target_status&.id }
 
       span.add_attributes(
@@ -64,7 +64,7 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   private
 
   def load_notifications
-    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_notifications') do
+    MastodonOTELTracer.in_span('Api::V2::NotificationsController#load_notifications') do
       notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_grouped_paginated_by_id(
         limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
         params.slice(:max_id, :since_id, :min_id, :grouped_types).permit(:max_id, :since_id, :min_id, grouped_types: [])
@@ -79,7 +79,7 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   def load_grouped_notifications
     return [] if @notifications.empty?
 
-    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
+    MastodonOTELTracer.in_span('Api::V2::NotificationsController#load_grouped_notifications') do
       NotificationGroup.from_notifications(@notifications, pagination_range: (@notifications.last.id)..(@notifications.first.id), grouped_types: params[:grouped_types])
     end
   end
@@ -101,11 +101,11 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   end
 
   def next_path
-    api_v2_alpha_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
+    api_v2_notifications_url pagination_params(max_id: pagination_max_id) unless @notifications.empty?
   end
 
   def prev_path
-    api_v2_alpha_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
+    api_v2_notifications_url pagination_params(min_id: pagination_since_id) unless @notifications.empty?
   end
 
   def pagination_collection
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
index e34dc85bb0..24d526655c 100644
--- a/app/javascript/mastodon/api/notifications.ts
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -37,7 +37,7 @@ export const apiFetchNotificationGroups = async (params?: {
 }) => {
   const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
-    url: '/api/v2_alpha/notifications',
+    url: '/api/v2/notifications',
     params,
   });
 
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index cced83587d..19361277ae 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -108,9 +108,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   end
 
   def api_versions
-    {
-      mastodon: 1,
-    }
+    Mastodon::Version.api_versions
   end
 
   private
diff --git a/config/routes/api.rb b/config/routes/api.rb
index df975065bd..b237791736 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -316,6 +316,21 @@ namespace :api, format: false do
     end
   end
 
+  concern :grouped_notifications do
+    resources :notifications, param: :group_key, only: [:index, :show] do
+      collection do
+        post :clear
+        get :unread_count
+      end
+
+      member do
+        post :dismiss
+      end
+
+      resources :accounts, only: [:index], module: :notifications
+    end
+  end
+
   namespace :v2 do
     get '/search', to: 'search#index', as: :search
 
@@ -341,21 +356,12 @@ namespace :api, format: false do
     namespace :notifications do
       resource :policy, only: [:show, :update]
     end
+
+    concerns :grouped_notifications
   end
 
-  namespace :v2_alpha do
-    resources :notifications, param: :group_key, only: [:index, :show] do
-      collection do
-        post :clear
-        get :unread_count
-      end
-
-      member do
-        post :dismiss
-      end
-
-      resources :accounts, only: [:index], module: :notifications
-    end
+  namespace :v2_alpha, module: 'v2' do
+    concerns :grouped_notifications
   end
 
   namespace :web do
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index caafa96b36..00e6160890 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -43,6 +43,12 @@ module Mastodon
       @gem_version ||= Gem::Version.new(to_s.split('+')[0])
     end
 
+    def api_versions
+      {
+        mastodon: 2,
+      }
+    end
+
     def repository
       ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
     end
diff --git a/spec/requests/api/v2_alpha/notifications/accounts_spec.rb b/spec/requests/api/v2/notifications/accounts_spec.rb
similarity index 84%
rename from spec/requests/api/v2_alpha/notifications/accounts_spec.rb
rename to spec/requests/api/v2/notifications/accounts_spec.rb
index 3c5bcd8996..102b009c0b 100644
--- a/spec/requests/api/v2_alpha/notifications/accounts_spec.rb
+++ b/spec/requests/api/v2/notifications/accounts_spec.rb
@@ -8,9 +8,9 @@ RSpec.describe 'Accounts in grouped notifications' do
   let(:scopes)  { 'read:notifications write:notifications' }
   let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
-  describe 'GET /api/v2_alpha/notifications/:group_key/accounts', :inline_jobs do
+  describe 'GET /api/v2/notifications/:group_key/accounts', :inline_jobs do
     subject do
-      get "/api/v2_alpha/notifications/#{user.account.notifications.first.group_key}/accounts", headers: headers, params: params
+      get "/api/v2/notifications/#{user.account.notifications.first.group_key}/accounts", headers: headers, params: params
     end
 
     let(:params) { {} }
@@ -71,8 +71,8 @@ RSpec.describe 'Accounts in grouped notifications' do
 
         expect(response)
           .to include_pagination_headers(
-            prev: api_v2_alpha_notification_accounts_url(limit: params[:limit], min_id: notifications.first.id),
-            next: api_v2_alpha_notification_accounts_url(limit: params[:limit], max_id: notifications.second.id)
+            prev: api_v2_notification_accounts_url(limit: params[:limit], min_id: notifications.first.id),
+            next: api_v2_notification_accounts_url(limit: params[:limit], max_id: notifications.second.id)
           )
       end
     end
diff --git a/spec/requests/api/v2/notifications_spec.rb b/spec/requests/api/v2/notifications_spec.rb
new file mode 100644
index 0000000000..edf333ecd8
--- /dev/null
+++ b/spec/requests/api/v2/notifications_spec.rb
@@ -0,0 +1,343 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Notifications' do
+  let(:user)    { Fabricate(:user, account_attributes: { username: 'alice' }) }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:scopes)  { 'read:notifications write:notifications' }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+  describe 'GET /api/v2/notifications/unread_count', :inline_jobs do
+    subject do
+      get '/api/v2/notifications/unread_count', headers: headers, params: params
+    end
+
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      ReblogService.new.call(Fabricate(:account), first_status)
+      PostStatusService.new.call(Fabricate(:account), text: 'Hello @alice')
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FavouriteService.new.call(Fabricate(:account), first_status)
+      FollowService.new.call(Fabricate(:account), user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'with no options' do
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq 4
+      end
+    end
+
+    context 'with grouped_types parameter' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq 5
+      end
+    end
+
+    context 'with a read marker' do
+      before do
+        id = user.account.notifications.browserable.order(id: :desc).offset(2).first.id
+        user.markers.create!(timeline: 'notifications', last_read_id: id)
+      end
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq 2
+      end
+    end
+
+    context 'with exclude_types param' do
+      let(:params) { { exclude_types: %w(mention) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq 3
+      end
+    end
+
+    context 'with a user-provided limit' do
+      let(:params) { { limit: 2 } }
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq 2
+      end
+    end
+
+    context 'when there are more notifications than the limit' do
+      before do
+        stub_const('Api::V2::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT', 2)
+      end
+
+      it 'returns a capped value' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:count]).to eq Api::V2::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+      end
+    end
+  end
+
+  describe 'GET /api/v2/notifications', :inline_jobs do
+    subject do
+      get '/api/v2/notifications', headers: headers, params: params
+    end
+
+    let(:bob)    { Fabricate(:user) }
+    let(:tom)    { Fabricate(:user) }
+    let(:params) { {} }
+
+    before do
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
+      ReblogService.new.call(bob.account, first_status)
+      PostStatusService.new.call(bob.account, text: 'Hello @alice')
+      FavouriteService.new.call(bob.account, first_status)
+      FavouriteService.new.call(tom.account, first_status)
+      FollowService.new.call(bob.account, user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    context 'when there are no notifications' do
+      before do
+        user.account.notifications.destroy_all
+      end
+
+      it 'returns 0 notifications' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:notification_groups]).to eq []
+      end
+    end
+
+    context 'with no options' do
+      it 'returns expected notification types', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
+      end
+    end
+
+    context 'with grouped_types param' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns everything, but does not group favourites' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:notification_groups]).to contain_exactly(
+          a_hash_including(
+            type: 'reblog',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'mention',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [tom.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'follow',
+            sample_account_ids: [bob.account_id.to_s]
+          )
+        )
+      end
+    end
+
+    context 'with exclude_types param' do
+      let(:params) { { exclude_types: %w(mention) } }
+
+      it 'returns everything but excluded type', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body.size).to_not eq 0
+        expect(body_json_types.uniq).to_not include 'mention'
+      end
+    end
+
+    context 'with types param' do
+      let(:params) { { types: %w(mention) } }
+
+      it 'returns only requested type', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_json_types.uniq).to eq ['mention']
+        expect(response.parsed_body.dig(:notification_groups, 0, :page_min_id)).to_not be_nil
+      end
+    end
+
+    context 'with limit param' do
+      let(:params) { { limit: 3 } }
+      let(:notifications) { user.account.notifications.reorder(id: :desc) }
+
+      it 'returns the requested number of notifications paginated', :aggregate_failures do
+        subject
+
+        expect(response.parsed_body[:notification_groups].size)
+          .to eq(params[:limit])
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v2_notifications_url(limit: params[:limit], min_id: notifications.first.id),
+            # TODO: one downside of the current approach is that we return the first ID matching the group,
+            # not the last that has been skipped, so pagination is very likely to give overlap
+            next: api_v2_notifications_url(limit: params[:limit], max_id: notifications[3].id)
+          )
+      end
+    end
+
+    context 'with since_id param' do
+      let(:params) { { since_id: notifications[2].id } }
+      let(:notifications) { user.account.notifications.reorder(id: :desc) }
+
+      it 'returns the requested number of notifications paginated', :aggregate_failures do
+        subject
+
+        expect(response.parsed_body[:notification_groups].size)
+          .to eq(2)
+
+        expect(response)
+          .to include_pagination_headers(
+            prev: api_v2_notifications_url(limit: params[:limit], min_id: notifications.first.id),
+            # TODO: one downside of the current approach is that we return the first ID matching the group,
+            # not the last that has been skipped, so pagination is very likely to give overlap
+            next: api_v2_notifications_url(limit: params[:limit], max_id: notifications[1].id)
+          )
+      end
+    end
+
+    context 'when requesting stripped-down accounts' do
+      let(:params) { { expand_accounts: 'partial_avatars' } }
+
+      let(:recent_account) { Fabricate(:account) }
+
+      before do
+        FavouriteService.new.call(recent_account, user.account.statuses.first)
+      end
+
+      it 'returns an account in "partial_accounts", with the expected keys', :aggregate_failures do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(response.parsed_body[:partial_accounts].size).to be > 0
+        expect(response.parsed_body[:partial_accounts][0].keys.map(&:to_sym)).to contain_exactly(:acct, :avatar, :avatar_static, :bot, :id, :locked, :url)
+        expect(response.parsed_body[:partial_accounts].pluck(:id)).to_not include(recent_account.id.to_s)
+        expect(response.parsed_body[:accounts].pluck(:id)).to include(recent_account.id.to_s)
+      end
+    end
+
+    context 'when passing an invalid value for "expand_accounts"' do
+      let(:params) { { expand_accounts: 'unknown_foobar' } }
+
+      it 'returns http bad request' do
+        subject
+
+        expect(response).to have_http_status(400)
+      end
+    end
+
+    def body_json_types
+      response.parsed_body[:notification_groups].pluck(:type)
+    end
+  end
+
+  describe 'GET /api/v2/notifications/:id' do
+    subject do
+      get "/api/v2/notifications/#{notification.group_key}", headers: headers
+    end
+
+    let(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
+
+    it_behaves_like 'forbidden for wrong scope', 'write write:notifications'
+
+    it 'returns http success' do
+      subject
+
+      expect(response).to have_http_status(200)
+    end
+
+    context 'when notification belongs to someone else' do
+      let(:notification) { Fabricate(:notification, group_key: 'foobar') }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v2/notifications/:id/dismiss' do
+    subject do
+      post "/api/v2/notifications/#{notification.group_key}/dismiss", headers: headers
+    end
+
+    let!(:notification) { Fabricate(:notification, account: user.account, group_key: 'foobar') }
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'destroys the notification' do
+      subject
+
+      expect(response).to have_http_status(200)
+      expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    context 'when notification belongs to someone else' do
+      let(:notification) { Fabricate(:notification) }
+
+      it 'returns http not found' do
+        subject
+
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+
+  describe 'POST /api/v2/notifications/clear' do
+    subject do
+      post '/api/v2/notifications/clear', headers: headers
+    end
+
+    before do
+      Fabricate(:notification, account: user.account)
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
+
+    it 'clears notifications for the account' do
+      subject
+
+      expect(user.account.reload.notifications).to be_empty
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/requests/api/v2_alpha/notifications_spec.rb b/spec/requests/api/v2_alpha/notifications_spec.rb
index b7821de561..6d7df45b65 100644
--- a/spec/requests/api/v2_alpha/notifications_spec.rb
+++ b/spec/requests/api/v2_alpha/notifications_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# TODO: remove this before 4.3.0-rc1
+
 require 'rails_helper'
 
 RSpec.describe 'Notifications' do
@@ -84,14 +86,14 @@ RSpec.describe 'Notifications' do
 
     context 'when there are more notifications than the limit' do
       before do
-        stub_const('Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT', 2)
+        stub_const('Api::V2::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT', 2)
       end
 
       it 'returns a capped value' do
         subject
 
         expect(response).to have_http_status(200)
-        expect(response.parsed_body[:count]).to eq Api::V2Alpha::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
+        expect(response.parsed_body[:count]).to eq Api::V2::NotificationsController::DEFAULT_NOTIFICATIONS_COUNT_LIMIT
       end
     end
   end
@@ -206,10 +208,10 @@ RSpec.describe 'Notifications' do
 
         expect(response)
           .to include_pagination_headers(
-            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.first.id),
+            prev: api_v2_notifications_url(limit: params[:limit], min_id: notifications.first.id),
             # TODO: one downside of the current approach is that we return the first ID matching the group,
             # not the last that has been skipped, so pagination is very likely to give overlap
-            next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[3].id)
+            next: api_v2_notifications_url(limit: params[:limit], max_id: notifications[3].id)
           )
       end
     end
@@ -226,10 +228,10 @@ RSpec.describe 'Notifications' do
 
         expect(response)
           .to include_pagination_headers(
-            prev: api_v2_alpha_notifications_url(limit: params[:limit], min_id: notifications.first.id),
+            prev: api_v2_notifications_url(limit: params[:limit], min_id: notifications.first.id),
             # TODO: one downside of the current approach is that we return the first ID matching the group,
             # not the last that has been skipped, so pagination is very likely to give overlap
-            next: api_v2_alpha_notifications_url(limit: params[:limit], max_id: notifications[1].id)
+            next: api_v2_notifications_url(limit: params[:limit], max_id: notifications[1].id)
           )
       end
     end

From c620452fd7e0e3b083bae4b68fa09384df322f4a Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 15:12:10 +0200
Subject: [PATCH 74/89] Enable grouped notifications unconditionally (#31929)

---
 app/javascript/mastodon/actions/markers.ts    |  8 +-----
 .../actions/notifications_migration.tsx       |  8 ++----
 app/javascript/mastodon/actions/streaming.js  | 28 ++++++-------------
 .../components/column_settings.jsx            | 14 ----------
 .../features/notifications_wrapper.jsx        |  7 +----
 .../ui/components/navigation_panel.jsx        | 11 +++-----
 app/javascript/mastodon/initial_state.js      |  2 --
 app/javascript/mastodon/locales/en.json       |  2 --
 app/javascript/mastodon/selectors/settings.ts |  5 ----
 app/serializers/initial_state_serializer.rb   |  1 -
 10 files changed, 16 insertions(+), 70 deletions(-)

diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 6254e3f083..0b3280c212 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -2,7 +2,6 @@ import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'mastodon/api_types/markers';
 import { getAccessToken } from 'mastodon/initial_state';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import type { AppDispatch, RootState } from 'mastodon/store';
 import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
 
@@ -76,12 +75,7 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return selectUseGroupedNotifications(state)
-    ? state.notificationGroups.lastReadId
-    : // @ts-expect-error state.notifications is not yet typed
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-      state.getIn(['notifications', 'lastReadId']);
+  return state.notificationGroups.lastReadId;
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
index 0d4da765ec..cd9f5ca3d6 100644
--- a/app/javascript/mastodon/actions/notifications_migration.tsx
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -1,14 +1,10 @@
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 import { createAppAsyncThunk } from 'mastodon/store';
 
 import { fetchNotifications } from './notification_groups';
-import { expandNotifications } from './notifications';
 
 export const initializeNotifications = createAppAsyncThunk(
   'notifications/initialize',
-  (_, { dispatch, getState }) => {
-    if (selectUseGroupedNotifications(getState()))
-      void dispatch(fetchNotifications());
-    else void dispatch(expandNotifications({}));
+  (_, { dispatch }) => {
+    void dispatch(fetchNotifications());
   },
 );
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 03013110c3..b6fc31fae8 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
-
 import { getLocale } from '../locales';
 import { connectStream } from '../stream';
 
@@ -105,18 +103,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(selectUseGroupedNotifications(getState())) {
-            dispatch(processNewNotificationForGroups(notificationJSON));
-          }
+          dispatch(processNewNotificationForGroups(notificationJSON));
           break;
         }
         case 'notifications_merged':
           const state = getState();
           if (state.notifications.top || !state.notifications.mounted)
             dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
-          if (selectUseGroupedNotifications(state)) {
-            dispatch(refreshStaleNotificationGroups());
-          }
+          dispatch(refreshStaleNotificationGroups());
           break;
         case 'conversation':
           // @ts-expect-error
@@ -141,21 +135,15 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
- * @param {Function} getState
  */
-async function refreshHomeTimelineAndNotification(dispatch, getState) {
+async function refreshHomeTimelineAndNotification(dispatch) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
 
-  // TODO: remove this once the groups feature replaces the previous one
-  if(selectUseGroupedNotifications(getState())) {
-    // TODO: polling for merged notifications
-    try {
-      await dispatch(pollRecentGroupNotifications());
-    } catch {
-      // TODO
-    }
-  } else {
-    await dispatch(expandNotifications({}));
+  // TODO: polling for merged notifications
+  try {
+    await dispatch(pollRecentGroupNotifications());
+  } catch {
+    // TODO
   }
 
   await dispatch(fetchAnnouncements());
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index ed2f4ada3a..ed2947c175 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { forceGroupedNotifications } from 'mastodon/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'mastodon/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -36,7 +35,6 @@ class ColumnSettings extends PureComponent {
 
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
-    const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
@@ -68,18 +66,6 @@ class ColumnSettings extends PureComponent {
 
         <PolicyControls />
 
-        {!forceGroupedNotifications && (
-          <section role='group' aria-labelledby='notifications-beta'>
-            <h3 id='notifications-beta'>
-              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-            </h3>
-
-            <div className='column-settings__row'>
-              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-            </div>
-          </section>
-        )}
-
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
diff --git a/app/javascript/mastodon/features/notifications_wrapper.jsx b/app/javascript/mastodon/features/notifications_wrapper.jsx
index 4b3efeb54e..50383d5ebf 100644
--- a/app/javascript/mastodon/features/notifications_wrapper.jsx
+++ b/app/javascript/mastodon/features/notifications_wrapper.jsx
@@ -1,13 +1,8 @@
-import Notifications from 'mastodon/features/notifications';
 import Notifications_v2 from 'mastodon/features/notifications_v2';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
-import { useAppSelector } from 'mastodon/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
-
   return (
-    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+    <Notifications_v2 {...props} />
   );
 };
 
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index 407276d126..0ca21e8976 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -37,7 +37,6 @@ import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'mastodon/permissions';
 import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
-import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
@@ -65,19 +64,17 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
-  const count = useSelector(state => state.getIn(['notifications', 'unread']));
-  const intl = useIntl();
 
-  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+  const count = useSelector(selectUnreadNotificationGroupsCount);
+  const intl = useIntl();
 
   return (
     <ColumnLink
       key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index cf33b12dd9..60b35cb31a 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -43,7 +43,6 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
- * @property {boolean} force_grouped_notifications
  */
 
 /**
@@ -119,7 +118,6 @@ export const criticalUpdatesPending = initialState?.critical_updates_pending;
 // @ts-expect-error
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
-export const forceGroupedNotifications = getMeta('force_grouped_notifications');
 
 /**
  * @returns {string | undefined}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 1de2dce440..7f2e88d440 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.beta.category": "Experimental features",
-  "notifications.column_settings.beta.grouping": "Group notifications",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
index 22e7c13b93..93276c6692 100644
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -1,4 +1,3 @@
-import { forceGroupedNotifications } from 'mastodon/initial_state';
 import type { RootState } from 'mastodon/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
@@ -26,10 +25,6 @@ export const selectSettingsNotificationsQuickFilterAdvanced = (
 ) =>
   state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
 
-export const selectUseGroupedNotifications = (state: RootState) =>
-  forceGroupedNotifications ||
-  (state.settings.getIn(['notifications', 'groupingBeta']) as boolean);
-
 export const selectSettingsNotificationsShowUnread = (state: RootState) =>
   state.settings.getIn(['notifications', 'showUnread']) as boolean;
 
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 25a352806f..13f332c95c 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -109,7 +109,6 @@ class InitialStateSerializer < ActiveModel::Serializer
       trends_as_landing_page: Setting.trends_as_landing_page,
       trends_enabled: Setting.trends,
       version: instance_presenter.version,
-      force_grouped_notifications: ENV['FORCE_GROUPED_NOTIFICATIONS'] == 'true',
     }
   end
 

From 6c76a7a90778e6b0f1daf33ff6a2725079c8f335 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 15:20:44 +0200
Subject: [PATCH 75/89] =?UTF-8?q?Fix=20cancel=20follow=20request=20button?=
 =?UTF-8?q?=20sometimes=20saying=20=E2=80=9CFollow=20back=E2=80=9D=20(#319?=
 =?UTF-8?q?34)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/follow_button.tsx          | 4 ++--
 .../mastodon/features/account/components/header.jsx           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index 222789318e..46314af309 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -75,10 +75,10 @@ export const FollowButton: React.FC<{
     label = <LoadingIndicator />;
   } else if (relationship.following && relationship.followed_by) {
     label = intl.formatMessage(messages.mutual);
-  } else if (!relationship.following && relationship.followed_by) {
-    label = intl.formatMessage(messages.followBack);
   } else if (relationship.following || relationship.requested) {
     label = intl.formatMessage(messages.unfollow);
+  } else if (relationship.followed_by) {
+    label = intl.formatMessage(messages.followBack);
   } else {
     label = intl.formatMessage(messages.follow);
   }
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 1326874e50..6583c1f604 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -92,10 +92,10 @@ const messageForFollowButton = relationship => {
 
   if (relationship.get('following') && relationship.get('followed_by')) {
     return messages.mutual;
-  } else if (!relationship.get('following') && relationship.get('followed_by')) {
-    return messages.followBack;
   } else if (relationship.get('following') || relationship.get('requested')) {
     return messages.unfollow;
+  } else if (relationship.get('followed_by')) {
+    return messages.followBack;
   } else {
     return messages.follow;
   }

From ca8e892c1abb91722c256030c83cabec8e3445ff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 16:51:56 +0200
Subject: [PATCH 76/89] Fix selectSettingsNotificationsExcludedTypes not being
 memoized properly (#31881)

---
 app/javascript/mastodon/selectors/settings.ts | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
index 93276c6692..e722ad0911 100644
--- a/app/javascript/mastodon/selectors/settings.ts
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -1,17 +1,27 @@
+import { createSelector } from '@reduxjs/toolkit';
+
 import type { RootState } from 'mastodon/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
 // state.settings is not yet typed, so we disable some ESLint checks for those selectors
-export const selectSettingsNotificationsShows = (state: RootState) =>
-  state.settings.getIn(['notifications', 'shows']).toJS() as Record<
-    string,
-    boolean
-  >;
+export const selectSettingsNotificationsShows = createSelector(
+  [
+    (state) =>
+      state.settings.getIn(['notifications', 'shows']) as Immutable.Map<
+        string,
+        boolean
+      >,
+  ],
+  (shows) => shows.toJS() as Record<string, boolean>,
+);
 
-export const selectSettingsNotificationsExcludedTypes = (state: RootState) =>
-  Object.entries(selectSettingsNotificationsShows(state))
-    .filter(([_type, enabled]) => !enabled)
-    .map(([type, _enabled]) => type);
+export const selectSettingsNotificationsExcludedTypes = createSelector(
+  [selectSettingsNotificationsShows],
+  (shows) =>
+    Object.entries(shows)
+      .filter(([_type, enabled]) => !enabled)
+      .map(([type, _enabled]) => type),
+);
 
 export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
   state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;

From e25634ccefb76c5d15a4b1f6edf6434ba449a277 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 11:54:03 +0200
Subject: [PATCH 77/89] [Glitch] Convert notification requests actions and
 reducers to Typescript

Port c0eda832f3cc0f4009a59836cd4494e9daeb844c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../glitch/actions/notification_groups.ts     |   8 +-
 .../glitch/actions/notification_requests.ts   | 234 +++++++++++++
 .../flavours/glitch/actions/notifications.js  | 328 ------------------
 .../flavours/glitch/api/notifications.ts      |  75 +++-
 .../glitch/api_types/notifications.ts         |   9 +
 .../components/notification_request.jsx       |   6 +-
 .../glitch/features/notifications/request.jsx |  32 +-
 .../features/notifications/requests.jsx       |  33 +-
 .../glitch/models/notification_request.ts     |  19 +
 .../glitch/reducers/notification_requests.js  | 114 ------
 .../glitch/reducers/notification_requests.ts  | 182 ++++++++++
 .../flavours/glitch/reducers/notifications.js |  10 +-
 .../flavours/glitch/store/typed_functions.ts  |  37 +-
 13 files changed, 590 insertions(+), 497 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/notification_requests.ts
 create mode 100644 app/javascript/flavours/glitch/models/notification_request.ts
 delete mode 100644 app/javascript/flavours/glitch/reducers/notification_requests.js
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_requests.ts

diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
index b0a54ad5b4..9b5a1ffeef 100644
--- a/app/javascript/flavours/glitch/actions/notification_groups.ts
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -2,7 +2,7 @@ import { createAction } from '@reduxjs/toolkit';
 
 import {
   apiClearNotifications,
-  apiFetchNotifications,
+  apiFetchNotificationGroups,
 } from 'flavours/glitch/api/notifications';
 import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
 import type {
@@ -71,7 +71,7 @@ function dispatchAssociatedRecords(
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',
   async (_params, { getState }) =>
-    apiFetchNotifications({ exclude_types: getExcludedTypes(getState()) }),
+    apiFetchNotificationGroups({ exclude_types: getExcludedTypes(getState()) }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
     dispatch(importFetchedAccounts(accounts));
     dispatch(importFetchedStatuses(statuses));
@@ -92,7 +92,7 @@ export const fetchNotifications = createDataLoadingThunk(
 export const fetchNotificationsGap = createDataLoadingThunk(
   'notificationGroups/fetchGap',
   async (params: { gap: NotificationGap }, { getState }) =>
-    apiFetchNotifications({
+    apiFetchNotificationGroups({
       max_id: params.gap.maxId,
       exclude_types: getExcludedTypes(getState()),
     }),
@@ -108,7 +108,7 @@ export const fetchNotificationsGap = createDataLoadingThunk(
 export const pollRecentNotifications = createDataLoadingThunk(
   'notificationGroups/pollRecentNotifications',
   async (_params, { getState }) => {
-    return apiFetchNotifications({
+    return apiFetchNotificationGroups({
       max_id: undefined,
       exclude_types: getExcludedTypes(getState()),
       // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
diff --git a/app/javascript/flavours/glitch/actions/notification_requests.ts b/app/javascript/flavours/glitch/actions/notification_requests.ts
new file mode 100644
index 0000000000..5e3bfd88e7
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notification_requests.ts
@@ -0,0 +1,234 @@
+import {
+  apiFetchNotificationRequest,
+  apiFetchNotificationRequests,
+  apiFetchNotifications,
+  apiAcceptNotificationRequest,
+  apiDismissNotificationRequest,
+  apiAcceptNotificationRequests,
+  apiDismissNotificationRequests,
+} from 'flavours/glitch/api/notifications';
+import type { ApiAccountJSON } from 'flavours/glitch/api_types/accounts';
+import type {
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+} from 'flavours/glitch/api_types/notifications';
+import type { ApiStatusJSON } from 'flavours/glitch/api_types/statuses';
+import type { AppDispatch, RootState } from 'flavours/glitch/store';
+import { createDataLoadingThunk } from 'flavours/glitch/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { decreasePendingNotificationsCount } from './notification_policies';
+
+// TODO: refactor with notification_groups
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if (notification.type === 'admin.report') {
+      fetchedAccounts.push(notification.report.target_account);
+    }
+
+    if (notification.type === 'moderation_warning') {
+      fetchedAccounts.push(notification.moderation_warning.target_account);
+    }
+
+    if ('status' in notification && notification.status) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/fetch',
+  async (_params, { getState }) => {
+    let sinceId = undefined;
+
+    if (getState().notificationRequests.items.length > 0) {
+      sinceId = getState().notificationRequests.items[0]?.id;
+    }
+
+    return apiFetchNotificationRequests({
+      since_id: sinceId,
+    });
+  },
+  ({ requests, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatch(importFetchedAccounts(requests.map((request) => request.account)));
+
+    return { requests, next: next?.uri };
+  },
+  {
+    condition: (_params, { getState }) =>
+      !getState().notificationRequests.isLoading,
+  },
+);
+
+export const fetchNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/fetch',
+  async ({ id }: { id: string }) => apiFetchNotificationRequest(id),
+  {
+    condition: ({ id }, { getState }) =>
+      !(
+        getState().notificationRequests.current.item?.id === id ||
+        getState().notificationRequests.current.isLoading
+      ),
+  },
+);
+
+export const expandNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/expand',
+  async (_, { getState }) => {
+    const nextUrl = getState().notificationRequests.next;
+    if (!nextUrl) throw new Error('missing URL');
+
+    return apiFetchNotificationRequests(undefined, nextUrl);
+  },
+  ({ requests, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatch(importFetchedAccounts(requests.map((request) => request.account)));
+
+    return { requests, next: next?.uri };
+  },
+  {
+    condition: (_, { getState }) =>
+      !!getState().notificationRequests.next &&
+      !getState().notificationRequests.isLoading,
+  },
+);
+
+export const fetchNotificationsForRequest = createDataLoadingThunk(
+  'notificationRequest/fetchNotifications',
+  async ({ accountId }: { accountId: string }, { getState }) => {
+    const sinceId =
+      // @ts-expect-error current.notifications.items is not yet typed
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      getState().notificationRequests.current.notifications.items[0]?.get(
+        'id',
+      ) as string | undefined;
+
+    return apiFetchNotifications({
+      since_id: sinceId,
+      account_id: accountId,
+    });
+  },
+  ({ notifications, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications, next: next?.uri };
+  },
+  {
+    condition: ({ accountId }, { getState }) => {
+      const current = getState().notificationRequests.current;
+      return !(
+        current.item?.account_id === accountId &&
+        current.notifications.isLoading
+      );
+    },
+  },
+);
+
+export const expandNotificationsForRequest = createDataLoadingThunk(
+  'notificationRequest/expandNotifications',
+  async (_, { getState }) => {
+    const nextUrl = getState().notificationRequests.current.notifications.next;
+    if (!nextUrl) throw new Error('missing URL');
+
+    return apiFetchNotifications(undefined, nextUrl);
+  },
+  ({ notifications, links }, { dispatch }) => {
+    const next = links.refs.find((link) => link.rel === 'next');
+
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications, next: next?.uri };
+  },
+  {
+    condition: ({ accountId }: { accountId: string }, { getState }) => {
+      const url = getState().notificationRequests.current.notifications.next;
+
+      return (
+        !!url &&
+        !getState().notificationRequests.current.notifications.isLoading &&
+        getState().notificationRequests.current.item?.account_id === accountId
+      );
+    },
+  },
+);
+
+const selectNotificationCountForRequest = (state: RootState, id: string) => {
+  const requests = state.notificationRequests.items;
+  const thisRequest = requests.find((request) => request.id === id);
+  return thisRequest ? thisRequest.notifications_count : 0;
+};
+
+export const acceptNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/accept',
+  ({ id }: { id: string }) => apiAcceptNotificationRequest(id),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { id } }) => {
+    const count = selectNotificationCountForRequest(getState(), id);
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const dismissNotificationRequest = createDataLoadingThunk(
+  'notificationRequest/dismiss',
+  ({ id }: { id: string }) => apiDismissNotificationRequest(id),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { id } }) => {
+    const count = selectNotificationCountForRequest(getState(), id);
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const acceptNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/acceptBulk',
+  ({ ids }: { ids: string[] }) => apiAcceptNotificationRequests(ids),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { ids } }) => {
+    const count = ids.reduce(
+      (count, id) => count + selectNotificationCountForRequest(getState(), id),
+      0,
+    );
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
+
+export const dismissNotificationRequests = createDataLoadingThunk(
+  'notificationRequests/dismissBulk',
+  ({ ids }: { ids: string[] }) => apiDismissNotificationRequests(ids),
+  (_data, { dispatch, getState, discardLoadData, actionArg: { ids } }) => {
+    const count = ids.reduce(
+      (count, id) => count + selectNotificationCountForRequest(getState(), id),
+      0,
+    );
+
+    dispatch(decreasePendingNotificationsCount(count));
+
+    // The payload is not used in any functions
+    return discardLoadData;
+  },
+);
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index e1bf4ffb60..70a1f23df5 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -18,7 +18,6 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { submitMarkers } from './markers';
-import { decreasePendingNotificationsCount } from './notification_policies';
 import { notificationsUpdate } from "./notifications_typed";
 import { register as registerPushNotifications } from './push_notifications';
 import { saveSettings } from './settings';
@@ -57,26 +56,6 @@ export const NOTIFICATIONS_MARK_AS_READ = 'NOTIFICATIONS_MARK_AS_READ';
 export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_SUPPORT';
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
-export const NOTIFICATION_REQUESTS_FETCH_REQUEST = 'NOTIFICATION_REQUESTS_FETCH_REQUEST';
-export const NOTIFICATION_REQUESTS_FETCH_SUCCESS = 'NOTIFICATION_REQUESTS_FETCH_SUCCESS';
-export const NOTIFICATION_REQUESTS_FETCH_FAIL    = 'NOTIFICATION_REQUESTS_FETCH_FAIL';
-
-export const NOTIFICATION_REQUESTS_EXPAND_REQUEST = 'NOTIFICATION_REQUESTS_EXPAND_REQUEST';
-export const NOTIFICATION_REQUESTS_EXPAND_SUCCESS = 'NOTIFICATION_REQUESTS_EXPAND_SUCCESS';
-export const NOTIFICATION_REQUESTS_EXPAND_FAIL    = 'NOTIFICATION_REQUESTS_EXPAND_FAIL';
-
-export const NOTIFICATION_REQUEST_FETCH_REQUEST = 'NOTIFICATION_REQUEST_FETCH_REQUEST';
-export const NOTIFICATION_REQUEST_FETCH_SUCCESS = 'NOTIFICATION_REQUEST_FETCH_SUCCESS';
-export const NOTIFICATION_REQUEST_FETCH_FAIL    = 'NOTIFICATION_REQUEST_FETCH_FAIL';
-
-export const NOTIFICATION_REQUEST_ACCEPT_REQUEST = 'NOTIFICATION_REQUEST_ACCEPT_REQUEST';
-export const NOTIFICATION_REQUEST_ACCEPT_SUCCESS = 'NOTIFICATION_REQUEST_ACCEPT_SUCCESS';
-export const NOTIFICATION_REQUEST_ACCEPT_FAIL    = 'NOTIFICATION_REQUEST_ACCEPT_FAIL';
-
-export const NOTIFICATION_REQUEST_DISMISS_REQUEST = 'NOTIFICATION_REQUEST_DISMISS_REQUEST';
-export const NOTIFICATION_REQUEST_DISMISS_SUCCESS = 'NOTIFICATION_REQUEST_DISMISS_SUCCESS';
-export const NOTIFICATION_REQUEST_DISMISS_FAIL    = 'NOTIFICATION_REQUEST_DISMISS_FAIL';
-
 export const NOTIFICATION_REQUESTS_ACCEPT_REQUEST = 'NOTIFICATION_REQUESTS_ACCEPT_REQUEST';
 export const NOTIFICATION_REQUESTS_ACCEPT_SUCCESS = 'NOTIFICATION_REQUESTS_ACCEPT_SUCCESS';
 export const NOTIFICATION_REQUESTS_ACCEPT_FAIL    = 'NOTIFICATION_REQUESTS_ACCEPT_FAIL';
@@ -85,14 +64,6 @@ export const NOTIFICATION_REQUESTS_DISMISS_REQUEST = 'NOTIFICATION_REQUESTS_DISM
 export const NOTIFICATION_REQUESTS_DISMISS_SUCCESS = 'NOTIFICATION_REQUESTS_DISMISS_SUCCESS';
 export const NOTIFICATION_REQUESTS_DISMISS_FAIL    = 'NOTIFICATION_REQUESTS_DISMISS_FAIL';
 
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST';
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS';
-export const NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL';
-
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST';
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
-export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
-
 defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
 });
@@ -105,12 +76,6 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
   }
 };
 
-const selectNotificationCountForRequest = (state, id) => {
-  const requests = state.getIn(['notificationRequests', 'items']);
-  const thisRequest = requests.find(request => request.get('id') === id);
-  return thisRequest ? thisRequest.get('notifications_count') : 0;
-};
-
 export const loadPending = () => ({
   type: NOTIFICATIONS_LOAD_PENDING,
 });
@@ -431,296 +396,3 @@ export function setBrowserPermission (value) {
     value,
   };
 }
-
-export const fetchNotificationRequests = () => (dispatch, getState) => {
-  const params = {};
-
-  if (getState().getIn(['notificationRequests', 'isLoading'])) {
-    return;
-  }
-
-  if (getState().getIn(['notificationRequests', 'items'])?.size > 0) {
-    params.since_id = getState().getIn(['notificationRequests', 'items', 0, 'id']);
-  }
-
-  dispatch(fetchNotificationRequestsRequest());
-
-  api().get('/api/v1/notifications/requests', { params }).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-    dispatch(fetchNotificationRequestsSuccess(response.data, next ? next.uri : null));
-  }).catch(err => {
-    dispatch(fetchNotificationRequestsFail(err));
-  });
-};
-
-export const fetchNotificationRequestsRequest = () => ({
-  type: NOTIFICATION_REQUESTS_FETCH_REQUEST,
-});
-
-export const fetchNotificationRequestsSuccess = (requests, next) => ({
-  type: NOTIFICATION_REQUESTS_FETCH_SUCCESS,
-  requests,
-  next,
-});
-
-export const fetchNotificationRequestsFail = error => ({
-  type: NOTIFICATION_REQUESTS_FETCH_FAIL,
-  error,
-});
-
-export const expandNotificationRequests = () => (dispatch, getState) => {
-  const url = getState().getIn(['notificationRequests', 'next']);
-
-  if (!url || getState().getIn(['notificationRequests', 'isLoading'])) {
-    return;
-  }
-
-  dispatch(expandNotificationRequestsRequest());
-
-  api().get(url).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(x => x.account)));
-    dispatch(expandNotificationRequestsSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(expandNotificationRequestsFail(err));
-  });
-};
-
-export const expandNotificationRequestsRequest = () => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_REQUEST,
-});
-
-export const expandNotificationRequestsSuccess = (requests, next) => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
-  requests,
-  next,
-});
-
-export const expandNotificationRequestsFail = error => ({
-  type: NOTIFICATION_REQUESTS_EXPAND_FAIL,
-  error,
-});
-
-export const fetchNotificationRequest = id => (dispatch, getState) => {
-  const current = getState().getIn(['notificationRequests', 'current']);
-
-  if (current.getIn(['item', 'id']) === id || current.get('isLoading')) {
-    return;
-  }
-
-  dispatch(fetchNotificationRequestRequest(id));
-
-  api().get(`/api/v1/notifications/requests/${id}`).then(({ data }) => {
-    dispatch(fetchNotificationRequestSuccess(data));
-  }).catch(err => {
-    dispatch(fetchNotificationRequestFail(id, err));
-  });
-};
-
-export const fetchNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_FETCH_REQUEST,
-  id,
-});
-
-export const fetchNotificationRequestSuccess = request => ({
-  type: NOTIFICATION_REQUEST_FETCH_SUCCESS,
-  request,
-});
-
-export const fetchNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_FETCH_FAIL,
-  id,
-  error,
-});
-
-export const acceptNotificationRequest = (id) => (dispatch, getState) => {
-  const count = selectNotificationCountForRequest(getState(), id);
-  dispatch(acceptNotificationRequestRequest(id));
-
-  api().post(`/api/v1/notifications/requests/${id}/accept`).then(() => {
-    dispatch(acceptNotificationRequestSuccess(id));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(acceptNotificationRequestFail(id, err));
-  });
-};
-
-export const acceptNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_REQUEST,
-  id,
-});
-
-export const acceptNotificationRequestSuccess = id => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_SUCCESS,
-  id,
-});
-
-export const acceptNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_ACCEPT_FAIL,
-  id,
-  error,
-});
-
-export const dismissNotificationRequest = (id) => (dispatch, getState) => {
-  const count = selectNotificationCountForRequest(getState(), id);
-  dispatch(dismissNotificationRequestRequest(id));
-
-  api().post(`/api/v1/notifications/requests/${id}/dismiss`).then(() =>{
-    dispatch(dismissNotificationRequestSuccess(id));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(dismissNotificationRequestFail(id, err));
-  });
-};
-
-export const dismissNotificationRequestRequest = id => ({
-  type: NOTIFICATION_REQUEST_DISMISS_REQUEST,
-  id,
-});
-
-export const dismissNotificationRequestSuccess = id => ({
-  type: NOTIFICATION_REQUEST_DISMISS_SUCCESS,
-  id,
-});
-
-export const dismissNotificationRequestFail = (id, error) => ({
-  type: NOTIFICATION_REQUEST_DISMISS_FAIL,
-  id,
-  error,
-});
-
-export const acceptNotificationRequests = (ids) => (dispatch, getState) => {
-  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
-  dispatch(acceptNotificationRequestsRequest(ids));
-
-  api().post(`/api/v1/notifications/requests/accept`, { id: ids }).then(() => {
-    dispatch(acceptNotificationRequestsSuccess(ids));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(acceptNotificationRequestFail(ids, err));
-  });
-};
-
-export const acceptNotificationRequestsRequest = ids => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
-  ids,
-});
-
-export const acceptNotificationRequestsSuccess = ids => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_SUCCESS,
-  ids,
-});
-
-export const acceptNotificationRequestsFail = (ids, error) => ({
-  type: NOTIFICATION_REQUESTS_ACCEPT_FAIL,
-  ids,
-  error,
-});
-
-export const dismissNotificationRequests = (ids) => (dispatch, getState) => {
-  const count = ids.reduce((count, id) => count + selectNotificationCountForRequest(getState(), id), 0);
-  dispatch(acceptNotificationRequestsRequest(ids));
-
-  api().post(`/api/v1/notifications/requests/dismiss`, { id: ids }).then(() => {
-    dispatch(dismissNotificationRequestsSuccess(ids));
-    dispatch(decreasePendingNotificationsCount(count));
-  }).catch(err => {
-    dispatch(dismissNotificationRequestFail(ids, err));
-  });
-};
-
-export const dismissNotificationRequestsRequest = ids => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_REQUEST,
-  ids,
-});
-
-export const dismissNotificationRequestsSuccess = ids => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_SUCCESS,
-  ids,
-});
-
-export const dismissNotificationRequestsFail = (ids, error) => ({
-  type: NOTIFICATION_REQUESTS_DISMISS_FAIL,
-  ids,
-  error,
-});
-
-export const fetchNotificationsForRequest = accountId => (dispatch, getState) => {
-  const current = getState().getIn(['notificationRequests', 'current']);
-  const params = { account_id: accountId };
-
-  if (current.getIn(['item', 'account']) === accountId) {
-    if (current.getIn(['notifications', 'isLoading'])) {
-      return;
-    }
-
-    if (current.getIn(['notifications', 'items'])?.size > 0) {
-      params.since_id = current.getIn(['notifications', 'items', 0, 'id']);
-    }
-  }
-
-  dispatch(fetchNotificationsForRequestRequest());
-
-  api().get('/api/v1/notifications', { params }).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
-    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
-    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
-
-    dispatch(fetchNotificationsForRequestSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(fetchNotificationsForRequestFail(err));
-  });
-};
-
-export const fetchNotificationsForRequestRequest = () => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
-});
-
-export const fetchNotificationsForRequestSuccess = (notifications, next) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
-  notifications,
-  next,
-});
-
-export const fetchNotificationsForRequestFail = (error) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
-  error,
-});
-
-export const expandNotificationsForRequest = () => (dispatch, getState) => {
-  const url = getState().getIn(['notificationRequests', 'current', 'notifications', 'next']);
-
-  if (!url || getState().getIn(['notificationRequests', 'current', 'notifications', 'isLoading'])) {
-    return;
-  }
-
-  dispatch(expandNotificationsForRequestRequest());
-
-  api().get(url).then(response => {
-    const next = getLinks(response).refs.find(link => link.rel === 'next');
-    dispatch(importFetchedAccounts(response.data.map(item => item.account)));
-    dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
-    dispatch(importFetchedAccounts(response.data.filter(item => item.report).map(item => item.report.target_account)));
-
-    dispatch(expandNotificationsForRequestSuccess(response.data, next?.uri));
-  }).catch(err => {
-    dispatch(expandNotificationsForRequestFail(err));
-  });
-};
-
-export const expandNotificationsForRequestRequest = () => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
-});
-
-export const expandNotificationsForRequestSuccess = (notifications, next) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
-  notifications,
-  next,
-});
-
-export const expandNotificationsForRequestFail = (error) => ({
-  type: NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
-  error,
-});
diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
index f1e3e4e5a2..c948ddf860 100644
--- a/app/javascript/flavours/glitch/api/notifications.ts
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -1,7 +1,36 @@
-import api, { apiRequest, getLinks } from 'flavours/glitch/api';
-import type { ApiNotificationGroupsResultJSON } from 'flavours/glitch/api_types/notifications';
+import api, {
+  apiRequest,
+  getLinks,
+  apiRequestGet,
+  apiRequestPost,
+} from 'flavours/glitch/api';
+import type {
+  ApiNotificationGroupsResultJSON,
+  ApiNotificationRequestJSON,
+  ApiNotificationJSON,
+} from 'flavours/glitch/api_types/notifications';
 
-export const apiFetchNotifications = async (params?: {
+export const apiFetchNotifications = async (
+  params?: {
+    account_id?: string;
+    since_id?: string;
+  },
+  url?: string,
+) => {
+  const response = await api().request<ApiNotificationJSON[]>({
+    method: 'GET',
+    url: url ?? '/api/v1/notifications',
+    params,
+  });
+
+  return {
+    notifications: response.data,
+    links: getLinks(response),
+  };
+};
+
+export const apiFetchNotificationGroups = async (params?: {
+  url?: string;
   exclude_types?: string[];
   max_id?: string;
   since_id?: string;
@@ -24,3 +53,43 @@ export const apiFetchNotifications = async (params?: {
 
 export const apiClearNotifications = () =>
   apiRequest<undefined>('POST', 'v1/notifications/clear');
+
+export const apiFetchNotificationRequests = async (
+  params?: {
+    since_id?: string;
+  },
+  url?: string,
+) => {
+  const response = await api().request<ApiNotificationRequestJSON[]>({
+    method: 'GET',
+    url: url ?? '/api/v1/notifications/requests',
+    params,
+  });
+
+  return {
+    requests: response.data,
+    links: getLinks(response),
+  };
+};
+
+export const apiFetchNotificationRequest = async (id: string) => {
+  return apiRequestGet<ApiNotificationRequestJSON>(
+    `v1/notifications/requests/${id}`,
+  );
+};
+
+export const apiAcceptNotificationRequest = async (id: string) => {
+  return apiRequestPost(`v1/notifications/requests/${id}/accept`);
+};
+
+export const apiDismissNotificationRequest = async (id: string) => {
+  return apiRequestPost(`v1/notifications/requests/${id}/dismiss`);
+};
+
+export const apiAcceptNotificationRequests = async (id: string[]) => {
+  return apiRequestPost('v1/notifications/requests/accept', { id });
+};
+
+export const apiDismissNotificationRequests = async (id: string[]) => {
+  return apiRequestPost('v1/notifications/dismiss/dismiss', { id });
+};
diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
index 758840a581..17c2ede32b 100644
--- a/app/javascript/flavours/glitch/api_types/notifications.ts
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -149,3 +149,12 @@ export interface ApiNotificationGroupsResultJSON {
   statuses: ApiStatusJSON[];
   notification_groups: ApiNotificationGroupJSON[];
 }
+
+export interface ApiNotificationRequestJSON {
+  id: string;
+  created_at: string;
+  updated_at: string;
+  notifications_count: string;
+  account: ApiAccountJSON;
+  last_status?: ApiStatusJSON;
+}
diff --git a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
index b0db186b72..111873902c 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/notification_request.jsx
@@ -12,7 +12,7 @@ import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { initBlockModal } from 'flavours/glitch/actions/blocks';
 import { initMuteModal } from 'flavours/glitch/actions/mutes';
-import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
+import { acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notification_requests';
 import { initReport } from 'flavours/glitch/actions/reports';
 import { Avatar } from 'flavours/glitch/components/avatar';
 import { CheckBox } from 'flavours/glitch/components/check_box';
@@ -40,11 +40,11 @@ export const NotificationRequest = ({ id, accountId, notificationsCount, checked
   const { push: historyPush } = useHistory();
 
   const handleDismiss = useCallback(() => {
-    dispatch(dismissNotificationRequest(id));
+    dispatch(dismissNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleAccept = useCallback(() => {
-    dispatch(acceptNotificationRequest(id));
+    dispatch(acceptNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleMute = useCallback(() => {
diff --git a/app/javascript/flavours/glitch/features/notifications/request.jsx b/app/javascript/flavours/glitch/features/notifications/request.jsx
index 3dd186f2bf..f33c92a205 100644
--- a/app/javascript/flavours/glitch/features/notifications/request.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/request.jsx
@@ -10,7 +10,13 @@ import { useSelector, useDispatch } from 'react-redux';
 import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
 import DoneIcon from '@/material-icons/400-24px/done.svg?react';
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
-import { fetchNotificationRequest, fetchNotificationsForRequest, expandNotificationsForRequest, acceptNotificationRequest, dismissNotificationRequest } from 'flavours/glitch/actions/notifications';
+import {
+  fetchNotificationRequest,
+  fetchNotificationsForRequest,
+  expandNotificationsForRequest,
+  acceptNotificationRequest,
+  dismissNotificationRequest,
+} from 'flavours/glitch/actions/notification_requests';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 import { IconButton } from 'flavours/glitch/components/icon_button';
@@ -44,28 +50,28 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
   const columnRef = useRef();
   const intl = useIntl();
   const dispatch = useDispatch();
-  const notificationRequest = useSelector(state => state.getIn(['notificationRequests', 'current', 'item', 'id']) === id ? state.getIn(['notificationRequests', 'current', 'item']) : null);
-  const accountId = notificationRequest?.get('account');
+  const notificationRequest = useSelector(state => state.notificationRequests.current.item?.id === id ? state.notificationRequests.current.item : null);
+  const accountId = notificationRequest?.account_id;
   const account = useSelector(state => state.getIn(['accounts', accountId]));
-  const notifications = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'items']));
-  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'current', 'notifications', 'isLoading']));
-  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'current', 'notifications', 'next']));
-  const removed = useSelector(state => state.getIn(['notificationRequests', 'current', 'removed']));
+  const notifications = useSelector(state => state.notificationRequests.current.notifications.items);
+  const isLoading = useSelector(state => state.notificationRequests.current.notifications.isLoading);
+  const hasMore = useSelector(state => !!state.notificationRequests.current.notifications.next);
+  const removed = useSelector(state => state.notificationRequests.current.removed);
 
   const handleHeaderClick = useCallback(() => {
     columnRef.current?.scrollTop();
   }, [columnRef]);
 
   const handleLoadMore = useCallback(() => {
-    dispatch(expandNotificationsForRequest());
-  }, [dispatch]);
+    dispatch(expandNotificationsForRequest({ accountId }));
+  }, [dispatch, accountId]);
 
   const handleDismiss = useCallback(() => {
-    dispatch(dismissNotificationRequest(id));
+    dispatch(dismissNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleAccept = useCallback(() => {
-    dispatch(acceptNotificationRequest(id));
+    dispatch(acceptNotificationRequest({ id }));
   }, [dispatch, id]);
 
   const handleMoveUp = useCallback(id => {
@@ -79,12 +85,12 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
   }, [columnRef, notifications]);
 
   useEffect(() => {
-    dispatch(fetchNotificationRequest(id));
+    dispatch(fetchNotificationRequest({ id }));
   }, [dispatch, id]);
 
   useEffect(() => {
     if (accountId) {
-      dispatch(fetchNotificationsForRequest(accountId));
+      dispatch(fetchNotificationsForRequest({ accountId }));
     }
   }, [dispatch, accountId]);
 
diff --git a/app/javascript/flavours/glitch/features/notifications/requests.jsx b/app/javascript/flavours/glitch/features/notifications/requests.jsx
index aa39805aac..87b5727555 100644
--- a/app/javascript/flavours/glitch/features/notifications/requests.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/requests.jsx
@@ -11,7 +11,12 @@ import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?rea
 import InventoryIcon from '@/material-icons/400-24px/inventory_2.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import { openModal } from 'flavours/glitch/actions/modal';
-import { fetchNotificationRequests, expandNotificationRequests, acceptNotificationRequests, dismissNotificationRequests } from 'flavours/glitch/actions/notifications';
+import {
+  fetchNotificationRequests,
+  expandNotificationRequests,
+  acceptNotificationRequests,
+  dismissNotificationRequests,
+} from 'flavours/glitch/actions/notification_requests';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { CheckBox } from 'flavours/glitch/components/check_box';
 import Column from 'flavours/glitch/components/column';
@@ -84,7 +89,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
         message: intl.formatMessage(messages.confirmAcceptMultipleMessage, { count: selectedItems.length }),
         confirm: intl.formatMessage(messages.confirmAcceptMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
-          dispatch(acceptNotificationRequests(selectedItems)),
+          dispatch(acceptNotificationRequests({ ids: selectedItems })),
       },
     }));
   }, [dispatch, intl, selectedItems]);
@@ -97,7 +102,7 @@ const SelectRow = ({selectAllChecked, toggleSelectAll, selectedItems, selectionM
         message: intl.formatMessage(messages.confirmDismissMultipleMessage, { count: selectedItems.length }),
         confirm: intl.formatMessage(messages.confirmDismissMultipleButton, { count: selectedItems.length}),
         onConfirm: () =>
-          dispatch(dismissNotificationRequests(selectedItems)),
+          dispatch(dismissNotificationRequests({ ids: selectedItems })),
       },
     }));
   }, [dispatch, intl, selectedItems]);
@@ -161,9 +166,9 @@ export const NotificationRequests = ({ multiColumn }) => {
   const columnRef = useRef();
   const intl = useIntl();
   const dispatch = useDispatch();
-  const isLoading = useSelector(state => state.getIn(['notificationRequests', 'isLoading']));
-  const notificationRequests = useSelector(state => state.getIn(['notificationRequests', 'items']));
-  const hasMore = useSelector(state => !!state.getIn(['notificationRequests', 'next']));
+  const isLoading = useSelector(state => state.notificationRequests.isLoading);
+  const notificationRequests = useSelector(state => state.notificationRequests.items);
+  const hasMore = useSelector(state => !!state.notificationRequests.next);
 
   const [selectionMode, setSelectionMode] = useState(false);
   const [checkedRequestIds, setCheckedRequestIds] = useState([]);
@@ -182,7 +187,7 @@ export const NotificationRequests = ({ multiColumn }) => {
       else
         ids.push(id);
 
-      setSelectAllChecked(ids.length === notificationRequests.size);
+      setSelectAllChecked(ids.length === notificationRequests.length);
 
       return [...ids];
     });
@@ -193,7 +198,7 @@ export const NotificationRequests = ({ multiColumn }) => {
       if(checked)
         setCheckedRequestIds([]);
       else
-        setCheckedRequestIds(notificationRequests.map(request => request.get('id')).toArray());
+        setCheckedRequestIds(notificationRequests.map(request => request.id));
 
       return !checked;
     });
@@ -217,7 +222,7 @@ export const NotificationRequests = ({ multiColumn }) => {
         multiColumn={multiColumn}
         showBackButton
         appendContent={
-          notificationRequests.size > 0 && (
+          notificationRequests.length > 0 && (
             <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />
           )}
       >
@@ -236,12 +241,12 @@ export const NotificationRequests = ({ multiColumn }) => {
       >
         {notificationRequests.map(request => (
           <NotificationRequest
-            key={request.get('id')}
-            id={request.get('id')}
-            accountId={request.get('account')}
-            notificationsCount={request.get('notifications_count')}
+            key={request.id}
+            id={request.id}
+            accountId={request.account_id}
+            notificationsCount={request.notifications_count}
             showCheckbox={selectionMode}
-            checked={checkedRequestIds.includes(request.get('id'))}
+            checked={checkedRequestIds.includes(request.id)}
             toggleCheck={handleCheck}
           />
         ))}
diff --git a/app/javascript/flavours/glitch/models/notification_request.ts b/app/javascript/flavours/glitch/models/notification_request.ts
new file mode 100644
index 0000000000..4b4b97758f
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/notification_request.ts
@@ -0,0 +1,19 @@
+import type { ApiNotificationRequestJSON } from 'flavours/glitch/api_types/notifications';
+
+export interface NotificationRequest
+  extends Omit<ApiNotificationRequestJSON, 'account' | 'notifications_count'> {
+  account_id: string;
+  notifications_count: number;
+}
+
+export function createNotificationRequestFromJSON(
+  requestJSON: ApiNotificationRequestJSON,
+): NotificationRequest {
+  const { account, notifications_count, ...request } = requestJSON;
+
+  return {
+    account_id: account.id,
+    notifications_count: +notifications_count,
+    ...request,
+  };
+}
diff --git a/app/javascript/flavours/glitch/reducers/notification_requests.js b/app/javascript/flavours/glitch/reducers/notification_requests.js
deleted file mode 100644
index 0a033682da..0000000000
--- a/app/javascript/flavours/glitch/reducers/notification_requests.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
-
-import { blockAccountSuccess, muteAccountSuccess } from 'flavours/glitch/actions/accounts';
-import {
-  NOTIFICATION_REQUESTS_EXPAND_REQUEST,
-  NOTIFICATION_REQUESTS_EXPAND_SUCCESS,
-  NOTIFICATION_REQUESTS_EXPAND_FAIL,
-  NOTIFICATION_REQUESTS_FETCH_REQUEST,
-  NOTIFICATION_REQUESTS_FETCH_SUCCESS,
-  NOTIFICATION_REQUESTS_FETCH_FAIL,
-  NOTIFICATION_REQUEST_FETCH_REQUEST,
-  NOTIFICATION_REQUEST_FETCH_SUCCESS,
-  NOTIFICATION_REQUEST_FETCH_FAIL,
-  NOTIFICATION_REQUEST_ACCEPT_REQUEST,
-  NOTIFICATION_REQUEST_DISMISS_REQUEST,
-  NOTIFICATION_REQUESTS_ACCEPT_REQUEST,
-  NOTIFICATION_REQUESTS_DISMISS_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS,
-  NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS,
-  NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL,
-} from 'flavours/glitch/actions/notifications';
-
-import { notificationToMap } from './notifications';
-
-const initialState = ImmutableMap({
-  items: ImmutableList(),
-  isLoading: false,
-  next: null,
-  current: ImmutableMap({
-    isLoading: false,
-    item: null,
-    removed: false,
-    notifications: ImmutableMap({
-      items: ImmutableList(),
-      isLoading: false,
-      next: null,
-    }),
-  }),
-});
-
-const normalizeRequest = request => fromJS({
-  ...request,
-  account: request.account.id,
-});
-
-const removeRequest = (state, id) => {
-  if (state.getIn(['current', 'item', 'id']) === id) {
-    state = state.setIn(['current', 'removed'], true);
-  }
-
-  return state.update('items', list => list.filterNot(item => item.get('id') === id));
-};
-
-const removeRequestByAccount = (state, account_id) => {
-  if (state.getIn(['current', 'item', 'account']) === account_id) {
-    state = state.setIn(['current', 'removed'], true);
-  }
-
-  return state.update('items', list => list.filterNot(item => item.get('account') === account_id));
-};
-
-export const notificationRequestsReducer = (state = initialState, action) => {
-  switch(action.type) {
-  case NOTIFICATION_REQUESTS_FETCH_SUCCESS:
-    return state.withMutations(map => {
-      map.update('items', list => ImmutableList(action.requests.map(normalizeRequest)).concat(list));
-      map.set('isLoading', false);
-      map.update('next', next => next ?? action.next);
-    });
-  case NOTIFICATION_REQUESTS_EXPAND_SUCCESS:
-    return state.withMutations(map => {
-      map.update('items', list => list.concat(ImmutableList(action.requests.map(normalizeRequest))));
-      map.set('isLoading', false);
-      map.set('next', action.next);
-    });
-  case NOTIFICATION_REQUESTS_EXPAND_REQUEST:
-  case NOTIFICATION_REQUESTS_FETCH_REQUEST:
-    return state.set('isLoading', true);
-  case NOTIFICATION_REQUESTS_EXPAND_FAIL:
-  case NOTIFICATION_REQUESTS_FETCH_FAIL:
-    return state.set('isLoading', false);
-  case NOTIFICATION_REQUEST_ACCEPT_REQUEST:
-  case NOTIFICATION_REQUEST_DISMISS_REQUEST:
-    return removeRequest(state, action.id);
-  case NOTIFICATION_REQUESTS_ACCEPT_REQUEST:
-  case NOTIFICATION_REQUESTS_DISMISS_REQUEST:
-    return action.ids.reduce((state, id) => removeRequest(state, id), state);
-  case blockAccountSuccess.type:
-    return removeRequestByAccount(state, action.payload.relationship.id);
-  case muteAccountSuccess.type:
-    return action.payload.relationship.muting_notifications ? removeRequestByAccount(state, action.payload.relationship.id) : state;
-  case NOTIFICATION_REQUEST_FETCH_REQUEST:
-    return state.set('current', initialState.get('current').set('isLoading', true));
-  case NOTIFICATION_REQUEST_FETCH_SUCCESS:
-    return state.update('current', map => map.set('isLoading', false).set('item', normalizeRequest(action.request)));
-  case NOTIFICATION_REQUEST_FETCH_FAIL:
-    return state.update('current', map => map.set('isLoading', false));
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_REQUEST:
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST:
-    return state.setIn(['current', 'notifications', 'isLoading'], true);
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_SUCCESS:
-    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => ImmutableList(action.notifications.map(notificationToMap)).concat(list)).update('next', next => next ?? action.next));
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS:
-    return state.updateIn(['current', 'notifications'], map => map.set('isLoading', false).update('items', list => list.concat(ImmutableList(action.notifications.map(notificationToMap)))).set('next', action.next));
-  case NOTIFICATIONS_FOR_REQUEST_FETCH_FAIL:
-  case NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL:
-    return state.setIn(['current', 'notifications', 'isLoading'], false);
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/flavours/glitch/reducers/notification_requests.ts b/app/javascript/flavours/glitch/reducers/notification_requests.ts
new file mode 100644
index 0000000000..033d9101c9
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_requests.ts
@@ -0,0 +1,182 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  blockAccountSuccess,
+  muteAccountSuccess,
+} from 'flavours/glitch/actions/accounts';
+import {
+  fetchNotificationRequests,
+  expandNotificationRequests,
+  fetchNotificationRequest,
+  fetchNotificationsForRequest,
+  expandNotificationsForRequest,
+  acceptNotificationRequest,
+  dismissNotificationRequest,
+  acceptNotificationRequests,
+  dismissNotificationRequests,
+} from 'flavours/glitch/actions/notification_requests';
+import type { NotificationRequest } from 'flavours/glitch/models/notification_request';
+import { createNotificationRequestFromJSON } from 'flavours/glitch/models/notification_request';
+
+import { notificationToMap } from './notifications';
+
+interface NotificationsListState {
+  items: unknown[]; // TODO
+  isLoading: boolean;
+  next: string | null;
+}
+
+interface CurrentNotificationRequestState {
+  item: NotificationRequest | null;
+  isLoading: boolean;
+  removed: boolean;
+  notifications: NotificationsListState;
+}
+
+interface NotificationRequestsState {
+  items: NotificationRequest[];
+  isLoading: boolean;
+  next: string | null;
+  current: CurrentNotificationRequestState;
+}
+
+const initialState: NotificationRequestsState = {
+  items: [],
+  isLoading: false,
+  next: null,
+  current: {
+    item: null,
+    isLoading: false,
+    removed: false,
+    notifications: {
+      isLoading: false,
+      items: [],
+      next: null,
+    },
+  },
+};
+
+const removeRequest = (state: NotificationRequestsState, id: string) => {
+  if (state.current.item?.id === id) {
+    state.current.removed = true;
+  }
+
+  state.items = state.items.filter((item) => item.id !== id);
+};
+
+const removeRequestByAccount = (
+  state: NotificationRequestsState,
+  account_id: string,
+) => {
+  if (state.current.item?.account_id === account_id) {
+    state.current.removed = true;
+  }
+
+  state.items = state.items.filter((item) => item.account_id !== account_id);
+};
+
+export const notificationRequestsReducer =
+  createReducer<NotificationRequestsState>(initialState, (builder) => {
+    builder
+      .addCase(fetchNotificationRequests.fulfilled, (state, action) => {
+        state.items = action.payload.requests
+          .map(createNotificationRequestFromJSON)
+          .concat(state.items);
+        state.isLoading = false;
+        state.next ??= action.payload.next ?? null;
+      })
+      .addCase(expandNotificationRequests.fulfilled, (state, action) => {
+        state.items = state.items.concat(
+          action.payload.requests.map(createNotificationRequestFromJSON),
+        );
+        state.isLoading = false;
+        state.next = action.payload.next ?? null;
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeRequestByAccount(state, action.payload.relationship.id);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeRequestByAccount(state, action.payload.relationship.id);
+      })
+      .addCase(fetchNotificationRequest.pending, (state) => {
+        state.current = { ...initialState.current, isLoading: true };
+      })
+      .addCase(fetchNotificationRequest.rejected, (state) => {
+        state.current.isLoading = false;
+      })
+      .addCase(fetchNotificationRequest.fulfilled, (state, action) => {
+        state.current.isLoading = false;
+        state.current.item = createNotificationRequestFromJSON(action.payload);
+      })
+      .addCase(fetchNotificationsForRequest.fulfilled, (state, action) => {
+        state.current.notifications.isLoading = false;
+        state.current.notifications.items.unshift(
+          ...action.payload.notifications.map(notificationToMap),
+        );
+        state.current.notifications.next ??= action.payload.next ?? null;
+      })
+      .addCase(expandNotificationsForRequest.fulfilled, (state, action) => {
+        state.current.notifications.isLoading = false;
+        state.current.notifications.items.push(
+          ...action.payload.notifications.map(notificationToMap),
+        );
+        state.current.notifications.next = action.payload.next ?? null;
+      })
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationRequests.pending,
+          expandNotificationRequests.pending,
+        ),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationRequests.rejected,
+          expandNotificationRequests.rejected,
+        ),
+        (state) => {
+          state.isLoading = false;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          acceptNotificationRequest.pending,
+          dismissNotificationRequest.pending,
+        ),
+        (state, action) => {
+          removeRequest(state, action.meta.arg.id);
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          acceptNotificationRequests.pending,
+          dismissNotificationRequests.pending,
+        ),
+        (state, action) => {
+          action.meta.arg.ids.forEach((id) => {
+            removeRequest(state, id);
+          });
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationsForRequest.pending,
+          expandNotificationsForRequest.pending,
+        ),
+        (state) => {
+          state.current.notifications.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(
+          fetchNotificationsForRequest.rejected,
+          expandNotificationsForRequest.rejected,
+        ),
+        (state) => {
+          state.current.notifications.isLoading = false;
+        },
+      );
+  });
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index b3c138583c..b9773a0da6 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -55,11 +55,11 @@ const initialState = ImmutableMap({
   markNewForDelete: false,
 });
 
-export const notificationToMap = (notification, markForDelete = false) => ImmutableMap({
+export const notificationToMap = (notification) => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
-  markedForDelete: markForDelete,
+  markedForDelete: false,
   status: notification.status ? notification.status.id : null,
   report: notification.report ? fromJS(notification.report) : null,
   event: notification.event ? fromJS(notification.event) : null,
@@ -76,7 +76,7 @@ const normalizeNotification = (state, notification, usePendingItems) => {
   }
 
   if (usePendingItems || !state.get('pendingItems').isEmpty()) {
-    return state.update('pendingItems', list => list.unshift(notificationToMap(notification, markNewForDelete))).update('unread', unread => unread + 1);
+    return state.update('pendingItems', list => list.unshift(notificationToMap(notification).set('markForDelete', markNewForDelete))).update('unread', unread => unread + 1);
   }
 
   if (shouldCountUnreadNotifications(state)) {
@@ -90,7 +90,7 @@ const normalizeNotification = (state, notification, usePendingItems) => {
       list = list.take(20);
     }
 
-    return list.unshift(notificationToMap(notification, markNewForDelete));
+    return list.unshift(notificationToMap(notification).set('markForDelete', markNewForDelete));
   });
 };
 
@@ -104,7 +104,7 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingMore
 
   const markNewForDelete = state.get('markNewForDelete');
   const lastReadId = state.get('lastReadId');
-  const newItems = ImmutableList(notifications.map((notification) => notificationToMap(notification, markNewForDelete)));
+  const newItems = ImmutableList(notifications.map((notification) => notificationToMap(notification).set('markForDelete', markNewForDelete)));
 
   return state.withMutations(mutable => {
     if (!newItems.isEmpty()) {
diff --git a/app/javascript/flavours/glitch/store/typed_functions.ts b/app/javascript/flavours/glitch/store/typed_functions.ts
index 544d619682..9fcc90c61b 100644
--- a/app/javascript/flavours/glitch/store/typed_functions.ts
+++ b/app/javascript/flavours/glitch/store/typed_functions.ts
@@ -33,8 +33,12 @@ interface AppThunkConfig {
 }
 type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
 
-interface AppThunkOptions {
+interface AppThunkOptions<Arg> {
   useLoadingBar?: boolean;
+  condition?: (
+    arg: Arg,
+    { getState }: { getState: AppThunkApi['getState'] },
+  ) => boolean;
 }
 
 const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
@@ -42,7 +46,7 @@ const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
 export function createThunk<Arg = void, Returned = void>(
   name: string,
   creator: (arg: Arg, api: AppThunkApi) => Returned | Promise<Returned>,
-  options: AppThunkOptions = {},
+  options: AppThunkOptions<Arg> = {},
 ) {
   return createBaseAsyncThunk(
     name,
@@ -70,6 +74,7 @@ export function createThunk<Arg = void, Returned = void>(
         if (options.useLoadingBar) return { useLoadingBar: true };
         return {};
       },
+      condition: options.condition,
     },
   );
 }
@@ -96,7 +101,7 @@ type ArgsType = Record<string, unknown> | undefined;
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
@@ -104,17 +109,19 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, DiscardLoadData>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
-  onDataOrThunkOptions?: AppThunkOptions | OnData<Args, LoadDataResult, void>,
-  thunkOptions?: AppThunkOptions,
+  onDataOrThunkOptions?:
+    | AppThunkOptions<Args>
+    | OnData<Args, LoadDataResult, void>,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, LoadDataResult>>;
 
 // Overload when there is an `onData` method returning something
@@ -126,9 +133,9 @@ export function createDataLoadingThunk<
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, Returned>,
-  thunkOptions?: AppThunkOptions,
+  thunkOptions?: AppThunkOptions<Args>,
 ): ReturnType<typeof createThunk<Args, Returned>>;
 
 /**
@@ -154,6 +161,7 @@ export function createDataLoadingThunk<
  * @param maybeThunkOptions
  *   Additional Mastodon specific options for the thunk. Currently supports:
  *   - `useLoadingBar` to display a loading bar while this action is pending. Defaults to true.
+ *   - `condition` is passed to `createAsyncThunk` (https://redux-toolkit.js.org/api/createAsyncThunk#canceling-before-execution)
  * @returns The created thunk
  */
 export function createDataLoadingThunk<
@@ -164,12 +172,12 @@ export function createDataLoadingThunk<
   name: string,
   loadData: LoadData<Args, LoadDataResult>,
   onDataOrThunkOptions?:
-    | AppThunkOptions
+    | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, Returned>,
-  maybeThunkOptions?: AppThunkOptions,
+  maybeThunkOptions?: AppThunkOptions<Args>,
 ) {
   let onData: OnData<Args, LoadDataResult, Returned> | undefined;
-  let thunkOptions: AppThunkOptions | undefined;
+  let thunkOptions: AppThunkOptions<Args> | undefined;
 
   if (typeof onDataOrThunkOptions === 'function') onData = onDataOrThunkOptions;
   else if (typeof onDataOrThunkOptions === 'object')
@@ -203,6 +211,9 @@ export function createDataLoadingThunk<
         return undefined as Returned;
       else return result;
     },
-    { useLoadingBar: thunkOptions?.useLoadingBar ?? true },
+    {
+      useLoadingBar: thunkOptions?.useLoadingBar ?? true,
+      condition: thunkOptions?.condition,
+    },
   );
 }

From b6398cf2d3bc5e61f8fa266b0c2953525550ade6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 16 Sep 2024 14:08:37 +0200
Subject: [PATCH 78/89] [Glitch] Fix horizontal scrollbar on who to follow
 carousel in web UI

Port efb0e2c34b2c2921ac0c0b999d99384882667d6c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 4f922e5139..f8ef556201 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -10761,6 +10761,7 @@ noscript {
       scroll-padding: 16px;
       scroll-behavior: smooth;
       overflow-x: scroll;
+      scrollbar-width: none;
 
       &__card {
         background: var(--background-color);

From 0740352ce6f0bf3d97f34665bbae27ed40a2b1e1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 14:10:02 +0200
Subject: [PATCH 79/89] [Glitch] Rename `/api/v2_alpha/notifications*` to
 `/api/v2/notifications*`

Port e0648a916ab81925545504173bf4f43ec64d4f3c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/api/notifications.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
index c948ddf860..a3055e3f3e 100644
--- a/app/javascript/flavours/glitch/api/notifications.ts
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -37,7 +37,7 @@ export const apiFetchNotificationGroups = async (params?: {
 }) => {
   const response = await api().request<ApiNotificationGroupsResultJSON>({
     method: 'GET',
-    url: '/api/v2_alpha/notifications',
+    url: '/api/v2/notifications',
     params,
   });
 

From 43f6792e1bec08d3804a16f710525dfe368518c6 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 22:51:19 +0200
Subject: [PATCH 80/89] Fix detailed statuses being clickable and linking to
 broken pages

---
 .../glitch/features/status/components/detailed_status.tsx        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
index a4e7fccf9a..11306afb61 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.tsx
@@ -381,6 +381,7 @@ export const DetailedStatus: React.FC<{
           tagLinks={tagMisleadingLinks}
           rewriteMentions={rewriteMentions}
           parseClick={parseClick}
+          disabled
           {...(statusContentProps as any)}
         />
 

From 5a33a5658b904b97a664f18eaad6587c7c6cf04e Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 16 Sep 2024 22:19:04 -0500
Subject: [PATCH 81/89] Fix background of text detection progress (#31943)

---
 app/javascript/styles/mastodon/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 3a2564df45..5016480f32 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3921,7 +3921,7 @@ $ui-header-logo-wordmark-width: 99px;
   }
 
   &__wrapper {
-    background: $white;
+    background: $ui-base-color;
     border: 1px solid var(--background-border-color);
     margin-bottom: 10px;
     border-radius: 4px;

From d2f907507857fb0d256c45dda34403ae1fe95cd8 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 17 Sep 2024 05:19:42 +0200
Subject: [PATCH 82/89] Increase no-gap-breakpoint by 32px to fix overflow
 (#31889)

---
 .../mastodon/features/ui/components/columns_area.jsx          | 4 ++--
 app/javascript/styles/mastodon/variables.scss                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.jsx b/app/javascript/mastodon/features/ui/components/columns_area.jsx
index 063ac28d96..5a2ea8c2c8 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.jsx
+++ b/app/javascript/mastodon/features/ui/components/columns_area.jsx
@@ -63,8 +63,8 @@ export default class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
-  // Corresponds to (max-width: $no-gap-breakpoint + 285px - 1px) in SCSS
-  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)');
+  // Corresponds to (max-width: $no-gap-breakpoint - 1px) in SCSS
+  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1206px)');
 
   state = {
     renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index c477e7a750..17442b9748 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -87,7 +87,7 @@ $media-modal-media-max-width: 100%;
 // put margins on top and bottom of image to avoid the screen covered by image.
 $media-modal-media-max-height: 80%;
 
-$no-gap-breakpoint: 1175px;
+$no-gap-breakpoint: 1207px;
 $mobile-breakpoint: 630px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;

From 6a233cbfcfa6e14e9575fd490ed018670793e9ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:02:53 +0200
Subject: [PATCH 83/89] New Crowdin Translations (automated) (#31946)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ar.json    |  2 --
 app/javascript/mastodon/locales/ast.json   |  1 -
 app/javascript/mastodon/locales/be.json    |  2 --
 app/javascript/mastodon/locales/bg.json    |  2 --
 app/javascript/mastodon/locales/ca.json    |  2 --
 app/javascript/mastodon/locales/cs.json    |  2 --
 app/javascript/mastodon/locales/cy.json    |  2 --
 app/javascript/mastodon/locales/da.json    |  2 --
 app/javascript/mastodon/locales/de.json    |  4 +---
 app/javascript/mastodon/locales/el.json    |  2 --
 app/javascript/mastodon/locales/en-GB.json |  2 --
 app/javascript/mastodon/locales/es-AR.json |  2 --
 app/javascript/mastodon/locales/es-MX.json |  2 --
 app/javascript/mastodon/locales/es.json    |  2 --
 app/javascript/mastodon/locales/et.json    |  2 --
 app/javascript/mastodon/locales/eu.json    |  2 --
 app/javascript/mastodon/locales/fa.json    |  2 --
 app/javascript/mastodon/locales/fi.json    |  2 --
 app/javascript/mastodon/locales/fo.json    |  2 --
 app/javascript/mastodon/locales/fr-CA.json |  2 --
 app/javascript/mastodon/locales/fr.json    |  2 --
 app/javascript/mastodon/locales/fy.json    |  2 --
 app/javascript/mastodon/locales/ga.json    |  2 --
 app/javascript/mastodon/locales/gd.json    |  2 --
 app/javascript/mastodon/locales/gl.json    |  2 --
 app/javascript/mastodon/locales/he.json    |  2 --
 app/javascript/mastodon/locales/hu.json    |  2 --
 app/javascript/mastodon/locales/ia.json    |  2 --
 app/javascript/mastodon/locales/is.json    |  2 --
 app/javascript/mastodon/locales/it.json    |  2 --
 app/javascript/mastodon/locales/ja.json    |  2 --
 app/javascript/mastodon/locales/kab.json   |  1 -
 app/javascript/mastodon/locales/ko.json    |  2 --
 app/javascript/mastodon/locales/lad.json   |  1 -
 app/javascript/mastodon/locales/lt.json    |  2 --
 app/javascript/mastodon/locales/lv.json    | 10 ++++++++++
 app/javascript/mastodon/locales/nl.json    |  2 --
 app/javascript/mastodon/locales/nn.json    |  2 --
 app/javascript/mastodon/locales/pl.json    |  2 --
 app/javascript/mastodon/locales/pt-BR.json |  2 --
 app/javascript/mastodon/locales/pt-PT.json |  2 --
 app/javascript/mastodon/locales/ru.json    |  1 -
 app/javascript/mastodon/locales/sc.json    |  2 --
 app/javascript/mastodon/locales/sl.json    |  2 --
 app/javascript/mastodon/locales/sq.json    |  2 --
 app/javascript/mastodon/locales/sv.json    |  2 --
 app/javascript/mastodon/locales/th.json    |  2 --
 app/javascript/mastodon/locales/tr.json    |  2 --
 app/javascript/mastodon/locales/uk.json    |  2 --
 app/javascript/mastodon/locales/vi.json    |  2 --
 app/javascript/mastodon/locales/zh-CN.json |  2 --
 app/javascript/mastodon/locales/zh-TW.json |  2 --
 52 files changed, 11 insertions(+), 99 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index dc89dc6e39..43256506cd 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -528,8 +528,6 @@
   "notifications.column_settings.admin.report": "التبليغات الجديدة:",
   "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
   "notifications.column_settings.alert": "إشعارات سطح المكتب",
-  "notifications.column_settings.beta.category": "ميزات تجريبية",
-  "notifications.column_settings.beta.grouping": "جمّع الإشعارات",
   "notifications.column_settings.favourite": "المفضلة:",
   "notifications.column_settings.filter_bar.advanced": "عرض جميع الفئات",
   "notifications.column_settings.filter_bar.category": "شريط التصفية السريعة",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 008dc6a663..219ea0d17c 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -297,7 +297,6 @@
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
-  "notifications.column_settings.beta.category": "Funciones esperimentales",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
   "notifications.column_settings.mention": "Menciones:",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index a0900b84e6..8c28e71d2c 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -523,8 +523,6 @@
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
   "notifications.column_settings.alert": "Апавяшчэнні на працоўным стале",
-  "notifications.column_settings.beta.category": "Эксперыментальныя функцыі",
-  "notifications.column_settings.beta.grouping": "Групаваць апавяшчэннi",
   "notifications.column_settings.favourite": "Упадабанае:",
   "notifications.column_settings.filter_bar.advanced": "Паказаць усе катэгорыі",
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 2a435c2074..507b8d2937 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -540,8 +540,6 @@
   "notifications.column_settings.admin.report": "Нови доклади:",
   "notifications.column_settings.admin.sign_up": "Нови регистрации:",
   "notifications.column_settings.alert": "Известия на работния плот",
-  "notifications.column_settings.beta.category": "Експериментални функции",
-  "notifications.column_settings.beta.grouping": "Групови известия",
   "notifications.column_settings.favourite": "Любими:",
   "notifications.column_settings.filter_bar.advanced": "Показване на всички категории",
   "notifications.column_settings.filter_bar.category": "Лента за бърз филтър",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index a637889503..3cdeab3ae4 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nous informes:",
   "notifications.column_settings.admin.sign_up": "Registres nous:",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
-  "notifications.column_settings.beta.category": "Característiques experimentals",
-  "notifications.column_settings.beta.grouping": "Notificacions de grup",
   "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.filter_bar.advanced": "Mostra totes les categories",
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 134e683fa1..af7a012813 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -509,8 +509,6 @@
   "notifications.column_settings.admin.report": "Nová hlášení:",
   "notifications.column_settings.admin.sign_up": "Nové registrace:",
   "notifications.column_settings.alert": "Oznámení na počítači",
-  "notifications.column_settings.beta.category": "Experimentální funkce",
-  "notifications.column_settings.beta.grouping": "Seskupit notifikace",
   "notifications.column_settings.favourite": "Oblíbené:",
   "notifications.column_settings.filter_bar.advanced": "Zobrazit všechny kategorie",
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index a585592955..51ea1bdf3a 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Adroddiadau newydd:",
   "notifications.column_settings.admin.sign_up": "Cofrestriadau newydd:",
   "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
-  "notifications.column_settings.beta.category": "Nodweddion arbrofol",
-  "notifications.column_settings.beta.grouping": "Grŵpio hysbysiadau",
   "notifications.column_settings.favourite": "Ffefrynnau:",
   "notifications.column_settings.filter_bar.advanced": "Dangos pob categori",
   "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 97d8215535..2c36869622 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nye anmeldelser:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
-  "notifications.column_settings.beta.category": "Eksperimentelle funktioner",
-  "notifications.column_settings.beta.grouping": "Gruppér notifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategorier",
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 03be448789..e6c086bfa2 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Registrierungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
-  "notifications.column_settings.beta.category": "Experimentelle Funktionen",
-  "notifications.column_settings.beta.grouping": "Benachrichtigungen gruppieren",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle Filterkategorien anzeigen",
   "notifications.column_settings.filter_bar.category": "Filterleiste",
@@ -777,7 +775,7 @@
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",
   "status.block": "@{name} blockieren",
-  "status.bookmark": "Beitrag als Lesezeichen setzen",
+  "status.bookmark": "Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.continued_thread": "Fortgeführter Thread",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index d832fa1014..367efe1cd9 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -551,8 +551,6 @@
   "notifications.column_settings.admin.report": "Νέες αναφορές:",
   "notifications.column_settings.admin.sign_up": "Νέες εγγραφές:",
   "notifications.column_settings.alert": "Ειδοποιήσεις επιφάνειας εργασίας",
-  "notifications.column_settings.beta.category": "Πειραματικές λειτουργίες",
-  "notifications.column_settings.beta.grouping": "Ομαδοποίηση ειδοποιήσεων",
   "notifications.column_settings.favourite": "Αγαπημένα:",
   "notifications.column_settings.filter_bar.advanced": "Εμφάνιση όλων των κατηγοριών",
   "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index d182cf6fe8..c81f389b9d 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "New reports:",
   "notifications.column_settings.admin.sign_up": "New sign-ups:",
   "notifications.column_settings.alert": "Desktop notifications",
-  "notifications.column_settings.beta.category": "Experimental features",
-  "notifications.column_settings.beta.grouping": "Group notifications",
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.filter_bar.advanced": "Display all categories",
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 9618616165..968b01babc 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Funciones experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 14afd1e108..d1abc392bf 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index c9f050b9de..6a428e353b 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuevos informes:",
   "notifications.column_settings.admin.sign_up": "Nuevos registros:",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentales",
-  "notifications.column_settings.beta.grouping": "Agrupar notificaciones",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas las categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index d202fb61a4..5b8e8369f6 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Uued teavitused:",
   "notifications.column_settings.admin.sign_up": "Uued kasutajad:",
   "notifications.column_settings.alert": "Töölauateated",
-  "notifications.column_settings.beta.category": "Eksperimentaalsed oskused",
-  "notifications.column_settings.beta.grouping": "Teavituste rühmitamine",
   "notifications.column_settings.favourite": "Lemmikud:",
   "notifications.column_settings.filter_bar.advanced": "Näita kõiki kategooriaid",
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 989a328d0a..acdd27ce2b 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -555,8 +555,6 @@
   "notifications.column_settings.admin.report": "Txosten berriak:",
   "notifications.column_settings.admin.sign_up": "Izen-emate berriak:",
   "notifications.column_settings.alert": "Mahaigaineko jakinarazpenak",
-  "notifications.column_settings.beta.category": "Ezaugarri esperimentalak",
-  "notifications.column_settings.beta.grouping": "Multzokatu jakinarazpenak",
   "notifications.column_settings.favourite": "Gogokoak:",
   "notifications.column_settings.filter_bar.advanced": "Bistaratu kategoria guztiak",
   "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 4221859fea..fba8d90235 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -534,8 +534,6 @@
   "notifications.column_settings.admin.report": "گزارش‌های جدید:",
   "notifications.column_settings.admin.sign_up": "ثبت نام‌های جدید:",
   "notifications.column_settings.alert": "آگاهی‌های میزکار",
-  "notifications.column_settings.beta.category": "ویژگی‌های آزمایشی",
-  "notifications.column_settings.beta.grouping": "گروه‌بندی آگاهی‌ها",
   "notifications.column_settings.favourite": "برگزیده‌ها:",
   "notifications.column_settings.filter_bar.advanced": "نمایش همۀ دسته‌ها",
   "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index e1a411e52e..681f5d5bb2 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Uudet raportit:",
   "notifications.column_settings.admin.sign_up": "Uudet rekisteröitymiset:",
   "notifications.column_settings.alert": "Työpöytäilmoitukset",
-  "notifications.column_settings.beta.category": "Kokeelliset ominaisuudet",
-  "notifications.column_settings.beta.grouping": "Ryhmittele ilmoitukset",
   "notifications.column_settings.favourite": "Suosikit:",
   "notifications.column_settings.filter_bar.advanced": "Näytä kaikki luokat",
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 9dd8feaf2f..793a75bb05 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nýggjar fráboðanir:",
   "notifications.column_settings.admin.sign_up": "Nýggjar tilmeldingar:",
   "notifications.column_settings.alert": "Skriviborðsfráboðanir",
-  "notifications.column_settings.beta.category": "Royndarhentleikar",
-  "notifications.column_settings.beta.grouping": "Bólkafráboðanir",
   "notifications.column_settings.favourite": "Dámdir postar:",
   "notifications.column_settings.filter_bar.advanced": "Vís allar bólkar",
   "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index f58e3b81e4..e89256bc2f 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements:",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions:",
   "notifications.column_settings.alert": "Notifications navigateur",
-  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
-  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris:",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 175601eb27..03cb6471d6 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nouveaux signalements :",
   "notifications.column_settings.admin.sign_up": "Nouvelles inscriptions :",
   "notifications.column_settings.alert": "Notifications du navigateur",
-  "notifications.column_settings.beta.category": "Fonctionnalités expérimentales",
-  "notifications.column_settings.beta.grouping": "Grouper les notifications",
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catégories",
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 0a51db36a4..2443692133 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -558,8 +558,6 @@
   "notifications.column_settings.admin.report": "Nije rapportaazjes:",
   "notifications.column_settings.admin.sign_up": "Nije registraasjes:",
   "notifications.column_settings.alert": "Desktopmeldingen",
-  "notifications.column_settings.beta.category": "Eksperimintele funksjes",
-  "notifications.column_settings.beta.grouping": "Notifikaasjes groepearje",
   "notifications.column_settings.favourite": "Favoriten:",
   "notifications.column_settings.filter_bar.advanced": "Alle kategoryen toane",
   "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 29d4f574c0..11da6b64e9 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Tuairiscí nua:",
   "notifications.column_settings.admin.sign_up": "Clárúcháin nua:",
   "notifications.column_settings.alert": "Fógraí deisce",
-  "notifications.column_settings.beta.category": "Gnéithe turgnamhacha",
-  "notifications.column_settings.beta.grouping": "Fógraí grúpa",
   "notifications.column_settings.favourite": "Ceanáin:",
   "notifications.column_settings.filter_bar.advanced": "Taispeáin gach catagóir",
   "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 76eb0c26b5..97748e0ee9 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
-  "notifications.column_settings.beta.category": "Gleusan deuchainneil",
-  "notifications.column_settings.beta.grouping": "Buidhnich na brathan",
   "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 1293d96bbd..d35bcd8cf5 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denuncias:",
   "notifications.column_settings.admin.sign_up": "Novas usuarias:",
   "notifications.column_settings.alert": "Notificacións de escritorio",
-  "notifications.column_settings.beta.category": "Características experimentais",
-  "notifications.column_settings.beta.grouping": "Notificacións de grupo",
   "notifications.column_settings.favourite": "Favoritas:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorías",
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 532c11d17c..de20d505c0 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
-  "notifications.column_settings.beta.category": "יכולות ניסיוניות",
-  "notifications.column_settings.beta.grouping": "התראות קבוצה",
   "notifications.column_settings.favourite": "חיבובים:",
   "notifications.column_settings.filter_bar.advanced": "להציג את כל הקטגוריות",
   "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 587f58f248..d4ced22463 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Új jelentések:",
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
-  "notifications.column_settings.beta.category": "Kísérleti funkciók",
-  "notifications.column_settings.beta.grouping": "Csoportértesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
   "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 8cfe2ecac0..9e7b583375 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -535,8 +535,6 @@
   "notifications.column_settings.admin.report": "Nove reportos:",
   "notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
   "notifications.column_settings.alert": "Notificationes de scriptorio",
-  "notifications.column_settings.beta.category": "Functionalitates experimental",
-  "notifications.column_settings.beta.grouping": "Notificationes de gruppo",
   "notifications.column_settings.favourite": "Favorites:",
   "notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index dc0b563f1f..fb807429f7 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nýjar kærur:",
   "notifications.column_settings.admin.sign_up": "Nýjar skráningar:",
   "notifications.column_settings.alert": "Tilkynningar á skjáborði",
-  "notifications.column_settings.beta.category": "Eiginleikar á tilraunastigi",
-  "notifications.column_settings.beta.grouping": "Tilkynningar hópa",
   "notifications.column_settings.favourite": "Eftirlæti:",
   "notifications.column_settings.filter_bar.advanced": "Birta alla flokka",
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index daa135afea..97518c5862 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nuove segnalazioni:",
   "notifications.column_settings.admin.sign_up": "Nuove iscrizioni:",
   "notifications.column_settings.alert": "Notifiche desktop",
-  "notifications.column_settings.beta.category": "Funzioni sperimentali",
-  "notifications.column_settings.beta.grouping": "Notifiche di gruppo",
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7ea1694f1e..38492a7361 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -558,8 +558,6 @@
   "notifications.column_settings.admin.report": "新しい通報:",
   "notifications.column_settings.admin.sign_up": "新規登録:",
   "notifications.column_settings.alert": "デスクトップ通知",
-  "notifications.column_settings.beta.category": "実験段階の機能",
-  "notifications.column_settings.beta.grouping": "通知をグループにまとめる",
   "notifications.column_settings.favourite": "お気に入り:",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 5ccfbecf81..24286a119f 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -411,7 +411,6 @@
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk alɣuten-inek·em i lebda?",
   "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
   "notifications.column_settings.alert": "Alɣuten n tnarit",
-  "notifications.column_settings.beta.grouping": "Segrew alɣuten",
   "notifications.column_settings.favourite": "Imenyafen:",
   "notifications.column_settings.filter_bar.advanced": "Sken-d akk taggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 751e5790e1..6795bc647c 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "새 신고:",
   "notifications.column_settings.admin.sign_up": "새로운 가입:",
   "notifications.column_settings.alert": "데스크탑 알림",
-  "notifications.column_settings.beta.category": "실험적인 기능",
-  "notifications.column_settings.beta.grouping": "알림 그룹화",
   "notifications.column_settings.favourite": "좋아요:",
   "notifications.column_settings.filter_bar.advanced": "모든 범주 표시",
   "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index f956abfb1e..72bf260501 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -490,7 +490,6 @@
   "notifications.column_settings.admin.report": "Muveos raportos:",
   "notifications.column_settings.admin.sign_up": "Muevas enrejistrasyones:",
   "notifications.column_settings.alert": "Avizos de ensimameza",
-  "notifications.column_settings.beta.category": "Funksyones eksperimentalas",
   "notifications.column_settings.favourite": "Te plazen:",
   "notifications.column_settings.filter_bar.advanced": "Amostra todas las kategorias",
   "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 86e8d092b8..5a510f5b96 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -552,8 +552,6 @@
   "notifications.column_settings.admin.report": "Naujos ataskaitos:",
   "notifications.column_settings.admin.sign_up": "Naujos registracijos:",
   "notifications.column_settings.alert": "Darbalaukio pranešimai",
-  "notifications.column_settings.beta.category": "Eksperimentinės funkcijos",
-  "notifications.column_settings.beta.grouping": "Grupuoti pranešimus",
   "notifications.column_settings.favourite": "Mėgstami:",
   "notifications.column_settings.filter_bar.advanced": "Rodyti visas kategorijas",
   "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 77dc5c497c..b53f65ab43 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -91,6 +91,7 @@
   "block_modal.show_more": "Parādīt mazāk",
   "block_modal.they_cant_mention": "Nevar Tevi pieminēt vai sekot Tev.",
   "block_modal.they_cant_see_posts": "Nevar redzēt Tavus ierakstus, un Tu neredzēsi lietotāja.",
+  "block_modal.title": "Bloķēt lietotāju?",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "boost_modal.reblog": "Pastiprināt ierakstu?",
   "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?",
@@ -155,6 +156,7 @@
   "compose_form.poll.single": "Jāizvēlas viens",
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
+  "compose_form.poll.type": "Stils",
   "compose_form.publish": "Iesūtīt",
   "compose_form.publish_form": "Jauns ieraksts",
   "compose_form.reply": "Atbildēt",
@@ -181,6 +183,7 @@
   "confirmations.mute.confirm": "Apklusināt",
   "confirmations.redraft.confirm": "Dzēst un pārrakstīt",
   "confirmations.redraft.message": "Vai tiešām vēlies dzēst šo ziņu un no jauna noformēt to? Izlase un pastiprinājumi tiks zaudēti, un atbildes uz sākotnējo ziņu tiks atstātas bez autoratlīdzības.",
+  "confirmations.redraft.title": "Dzēst un rakstīt vēlreiz?",
   "confirmations.reply.confirm": "Atbildēt",
   "confirmations.reply.message": "Tūlītēja atbildēšana pārrakstīs pašlaik sastādīto ziņu. Vai tiešām turpināt?",
   "confirmations.reply.title": "Pārrakstīt ierakstu?",
@@ -208,7 +211,11 @@
   "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
   "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
+  "domain_block_modal.block": "Bloķēt serveri",
   "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
+  "domain_block_modal.they_wont_know": "Viņi nezinās, ka tikuši bloķēti.",
+  "domain_block_modal.title": "Bloķēt domēnu?",
+  "domain_block_modal.you_will_lose_followers": "Tiks noņemti visi tavi sekotāji no šī servera.",
   "domain_pill.server": "Serveris",
   "domain_pill.username": "Lietotājvārds",
   "embed.instructions": "Iestrādā šo ziņu savā mājaslapā, kopējot zemāk redzamo kodu.",
@@ -277,6 +284,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
+  "filter_warning.matches_filter": "Atbilst filtram “{title}”",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
@@ -285,6 +293,7 @@
   "follow_requests.unlocked_explanation": "Lai gan Tavs konts nav slēgts, {domain} darbinieki iedomājās, ka Tu varētu vēlēties pašrocīgi pārskatīt sekošanas pieprasījumus no šiem kontiem.",
   "follow_suggestions.curated_suggestion": "Darbinieku izvēle",
   "follow_suggestions.dismiss": "Vairs nerādīt",
+  "follow_suggestions.friends_of_friends_longer": "Populārs to cilvēku vidū, kuriem tu seko",
   "follow_suggestions.personalized_suggestion": "Pielāgots ieteikums",
   "follow_suggestions.similar_to_recently_followed_longer": "Līdzīgi profieliem, kuriem nesen sāki sekot",
   "follow_suggestions.view_all": "Skatīt visu",
@@ -315,6 +324,7 @@
   "hashtag.follow": "Sekot tēmturim",
   "hashtag.unfollow": "Pārstāt sekot tēmturim",
   "hashtags.and_other": "… un {count, plural, other {vēl #}}",
+  "hints.threads.replies_may_be_missing": "Var trūkt atbildes no citiem serveriem.",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index d4c6b727f7..1043ca8376 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nieuwe rapportages:",
   "notifications.column_settings.admin.sign_up": "Nieuwe registraties:",
   "notifications.column_settings.alert": "Desktopmeldingen",
-  "notifications.column_settings.beta.category": "Experimentele functies",
-  "notifications.column_settings.beta.grouping": "Gegroepeerde meldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.filter_bar.advanced": "Alle categorieën tonen",
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 3d0634ef61..c4b5f0291d 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nye rapportar:",
   "notifications.column_settings.admin.sign_up": "Nyleg registrerte:",
   "notifications.column_settings.alert": "Skrivebordsvarsel",
-  "notifications.column_settings.beta.category": "Eksperimentelle funksjonar",
-  "notifications.column_settings.beta.grouping": "Grupper varslingar",
   "notifications.column_settings.favourite": "Favorittar:",
   "notifications.column_settings.filter_bar.advanced": "Vis alle kategoriar",
   "notifications.column_settings.filter_bar.category": "Snøggfilterline",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 34154fe5a3..d415bb3811 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Nowe zgłoszenia:",
   "notifications.column_settings.admin.sign_up": "Nowe rejestracje:",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
-  "notifications.column_settings.beta.category": "Funkcje eksperymentalne",
-  "notifications.column_settings.beta.grouping": "Powiadomienia grupowe",
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.filter_bar.advanced": "Wyświetl wszystkie kategorie",
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 235cec145d..053ae25822 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no computador",
-  "notifications.column_settings.beta.category": "Recursos experimentais",
-  "notifications.column_settings.beta.grouping": "Agrupar notificações",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Exibir todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index dd70e809a3..ed4bb9ba01 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Novas denúncias:",
   "notifications.column_settings.admin.sign_up": "Novas inscrições:",
   "notifications.column_settings.alert": "Notificações no ambiente de trabalho",
-  "notifications.column_settings.beta.category": "Funcionalidades experimentais",
-  "notifications.column_settings.beta.grouping": "Agrupar notificações",
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index e335bff299..4a03f2b6e8 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -502,7 +502,6 @@
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
-  "notifications.column_settings.beta.category": "Экспериментальные функции",
   "notifications.column_settings.favourite": "Избранные:",
   "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index ecf5141eb5..071643a153 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -421,8 +421,6 @@
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
   "notifications.column_settings.admin.report": "Informes noos:",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
-  "notifications.column_settings.beta.category": "Funtzionalidades isperimentales",
-  "notifications.column_settings.beta.grouping": "Notìficas de grupu",
   "notifications.column_settings.favourite": "Preferidos:",
   "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtru lestru",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 183636a653..bdc1d56062 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -520,8 +520,6 @@
   "notifications.column_settings.admin.report": "Nove prijave:",
   "notifications.column_settings.admin.sign_up": "Novi vpisi:",
   "notifications.column_settings.alert": "Namizna obvestila",
-  "notifications.column_settings.beta.category": "Poskusne funkcionalnosti",
-  "notifications.column_settings.beta.grouping": "Skupine obvestil",
   "notifications.column_settings.favourite": "Priljubljeni:",
   "notifications.column_settings.filter_bar.advanced": "Prikaži vse kategorije",
   "notifications.column_settings.filter_bar.category": "Vrstica za hitro filtriranje",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 745bba179f..ea3c6d5c7c 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Raportime të reja:",
   "notifications.column_settings.admin.sign_up": "Regjistrime të reja:",
   "notifications.column_settings.alert": "Njoftime desktopi",
-  "notifications.column_settings.beta.category": "Veçori eksperimentale",
-  "notifications.column_settings.beta.grouping": "Njoftime grupi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 14fac1ec8d..4d560a6495 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -554,8 +554,6 @@
   "notifications.column_settings.admin.report": "Nya rapporter:",
   "notifications.column_settings.admin.sign_up": "Nya registreringar:",
   "notifications.column_settings.alert": "Skrivbordsaviseringar",
-  "notifications.column_settings.beta.category": "Experimentella funktioner",
-  "notifications.column_settings.beta.grouping": "Gruppera notifikationer",
   "notifications.column_settings.favourite": "Favoriter:",
   "notifications.column_settings.filter_bar.advanced": "Visa alla kategorier",
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 69651df82c..9578431ff7 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "รายงานใหม่:",
   "notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
-  "notifications.column_settings.beta.category": "คุณลักษณะการทดลอง",
-  "notifications.column_settings.beta.grouping": "การแจ้งเตือนกลุ่ม",
   "notifications.column_settings.favourite": "รายการโปรด:",
   "notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
   "notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 5e875ff64f..d4d7d3d113 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Yeni bildirimler:",
   "notifications.column_settings.admin.sign_up": "Yeni kayıtlar:",
   "notifications.column_settings.alert": "Masaüstü bildirimleri",
-  "notifications.column_settings.beta.category": "Deneysel özellikler",
-  "notifications.column_settings.beta.grouping": "Grup bildirimleri",
   "notifications.column_settings.favourite": "Favorilerin:",
   "notifications.column_settings.filter_bar.advanced": "Tüm kategorileri görüntüle",
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index a9fd44ee6c..a1d3a872df 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Нові скарги:",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення стільниці",
-  "notifications.column_settings.beta.category": "Експериментальні функції",
-  "notifications.column_settings.beta.grouping": "Групові сповіщення",
   "notifications.column_settings.favourite": "Уподобане:",
   "notifications.column_settings.filter_bar.advanced": "Показати всі категорії",
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 08fc44d83d..9fcd00ddc7 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "Báo cáo mới:",
   "notifications.column_settings.admin.sign_up": "Người mới tham gia:",
   "notifications.column_settings.alert": "Báo trên máy tính",
-  "notifications.column_settings.beta.category": "Tính năng thử nghiệm",
-  "notifications.column_settings.beta.grouping": "Gộp thông báo theo loại",
   "notifications.column_settings.favourite": "Lượt thích:",
   "notifications.column_settings.filter_bar.advanced": "Toàn bộ",
   "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index dd86b92cce..6df3cde208 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "新举报：",
   "notifications.column_settings.admin.sign_up": "新注册：",
   "notifications.column_settings.alert": "桌面通知",
-  "notifications.column_settings.beta.category": "实验性功能",
-  "notifications.column_settings.beta.grouping": "通知分组",
   "notifications.column_settings.favourite": "喜欢：",
   "notifications.column_settings.filter_bar.advanced": "显示所有类别",
   "notifications.column_settings.filter_bar.category": "快速筛选栏",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index a2168c42a4..d69f54f7c8 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -559,8 +559,6 @@
   "notifications.column_settings.admin.report": "新檢舉報告：",
   "notifications.column_settings.admin.sign_up": "新註冊帳號：",
   "notifications.column_settings.alert": "桌面通知",
-  "notifications.column_settings.beta.category": "實驗性功能",
-  "notifications.column_settings.beta.grouping": "分組通知",
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.filter_bar.advanced": "顯示所有分類",
   "notifications.column_settings.filter_bar.category": "快速過濾器",

From d8f9db547a3d3354b747b2aa609ff12017f60edd Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Tue, 17 Sep 2024 16:59:29 +0200
Subject: [PATCH 84/89] Merge commit from fork

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
---
 app/javascript/mastodon/reducers/accounts_map.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/reducers/accounts_map.js b/app/javascript/mastodon/reducers/accounts_map.js
index 9053dcc9c0..d1229169cc 100644
--- a/app/javascript/mastodon/reducers/accounts_map.js
+++ b/app/javascript/mastodon/reducers/accounts_map.js
@@ -4,11 +4,10 @@ import { ACCOUNT_LOOKUP_FAIL } from '../actions/accounts';
 import { importAccounts } from '../actions/accounts_typed';
 import { domain } from '../initial_state';
 
-export const normalizeForLookup = str => {
-  str = str.toLowerCase();
-  const trailingIndex = str.indexOf(`@${domain.toLowerCase()}`);
-  return (trailingIndex > 0) ? str.slice(0, trailingIndex) : str;
-};
+const pattern = new RegExp(`@${domain}$`, 'gi');
+
+export const normalizeForLookup = str =>
+  str.toLowerCase().replace(pattern, '');
 
 const initialState = ImmutableMap();
 

From 3e91c101b3c4b5166dab778837e38bed424b4333 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 17 Sep 2024 17:42:45 +0200
Subject: [PATCH 85/89] Bump version to 4.3.0-beta.2 (#31948)

---
 CHANGELOG.md            | 60 ++++++++++++++++++++++++++++++-----------
 docker-compose.yml      |  6 ++---
 lib/mastodon/version.rb |  2 +-
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02ac2898dd..8d1e0bfcf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,21 +10,24 @@ The following changelog entries focus on changes visible to users, administrator
 
 - **Add confirmation interstitial instead of silently redirecting logged-out visitors to remote resources** (#27792, #28902, and #30651 by @ClearlyClaire and @Gargron)\
   This fixes a longstanding open redirect in Mastodon, at the cost of added friction when local links to remote resources are shared.
+- Change `form-action` Content-Security-Policy directive to be more restrictive (#26897 by @ClearlyClaire)
+- Update dependencies
 
 ### Added
 
-- **Add experimental server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, and #31513 by @ClearlyClaire, @mgmn, and @renchap)\
+- **Add server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, #31513, #31592, #31594, #31638, #31746, #31652, #31709, #31725, #31745, #31613, #31657, #31840, #31610 and #31929 by @ClearlyClaire, @Gargron, @mgmn, and @renchap)\
   Group notifications of the same type for the same target, so that your notifications no longer get cluttered by boost and favorite notifications as soon as a couple of your posts get traction.\
   This is done server-side so that clients can efficiently get relevant groups without having to go through numerous pages of individual notifications.\
   As part of this, the visual design of the entire notifications feature has been revamped.\
   This feature is intended to eventually replace the existing notifications column, but for this first beta, users will have to enable it in the “Experimental features” section of the notifications column settings.\
   The API is not final yet, but it consists of:
   - a new `group_key` attribute to `Notification` entities
-  - `GET /api/v2_alpha/notifications`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-grouped
-  - `GET /api/v2_alpha/notifications/:group_key`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-notification-group
-  - `POST /api/v2_alpha/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/notifications_alpha/#dismiss-group
-  - `GET /api/v2_alpha/notifications/:unread_count`: https://docs.joinmastodon.org/methods/notifications_alpha/#unread-group-count
-- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, and #31541 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
+  - `GET /api/v2/notifications`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-grouped
+  - `GET /api/v2/notifications/:group_key`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-notification-group
+  - `GET /api/v2/notifications/:group_key/accounts`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-group-accounts
+  - `POST /api/v2/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/grouped_notifications/#dismiss-group
+  - `GET /api/v2/notifications/:unread_count`: https://docs.joinmastodon.org/methods/grouped_notifications/#unread-group-count
+- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, and #31723 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
   The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\
   You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
   Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
@@ -57,19 +60,22 @@ The following changelog entries focus on changes visible to users, administrator
 - **Add timeline of public posts about a trending link** (#30381 and #30840 by @Gargron)\
   You can now see public posts mentioning currently-trending articles from people who have opted into discovery features.\
   This adds a new REST API endpoint: https://docs.joinmastodon.org/methods/timelines/#link
-- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, and #30846 by @Gargron)\
+- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, #30846, #31819, and #31900 by @Gargron and @oneiros)\
   This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\
   Articles hosted outside the fediverse can indicate a fediverse author with a meta tag:
   ```html
   <meta name="fediverse:creator" content="username@domain" />
   ```
   On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors\
-  Note that this feature is still work in progress and the tagging format and verification mechanisms may change in future releases.
+  Users can allow arbitrary domains to use `fediverse:creator` to credit them by visiting `/settings/verification`.\
+  This is federated as a new `attributionDomains` property in the `http://joinmastodon.org/ns` namespace, containing an array of domain names: https://docs.joinmastodon.org/spec/activitypub/#properties-used-1
 - **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\
   In addition to email notifications, also notify users of moderation actions or warnings against them directly within the app, so they are less likely to miss important communication from their moderators.\
   This adds the `moderation_warning` notification type to the REST API and streaming, with a new [`moderation_warning` attribute](https://docs.joinmastodon.org/entities/Notification/#moderation_warning).
 - **Add domain information to profiles in web UI** (#29602 by @Gargron)\
   Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation.
+- **Add support for Redis sentinel** (#31694, #31623, #31744, #31767, and #31768 by @ThisIsMissEm and @oneiros)\
+  See https://docs.joinmastodon.org/admin/scaling/#redis-sentinel
 - Add ability to reorder uploaded media before posting in web UI (#28456 by @Gargron)
 - Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm)
 - Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\
@@ -77,6 +83,8 @@ The following changelog entries focus on changes visible to users, administrator
 - Add `api_versions` to `/api/v2/instance` (#31354 by @ClearlyClaire)\
   Add API version number to make it easier for clients to detect compatible features going forward.\
   See API documentation at https://docs.joinmastodon.org/entities/Instance/#api-versions
+- Add quick links to Administration and Moderation Reports from Web UI (#24838 by @ThisIsMissEm)
+- Add link to `/admin/roles` in moderation interface when changing someone's role (#31791 by @ClearlyClaire)
 - Add recent audit log entries in federation moderation interface (#27386 by @ThisIsMissEm)
 - Add profile setup to onboarding in web UI (#27829, #27876, and #28453 by @Gargron)
 - Add prominent share/copy button on profiles in web UI (#27865 and #27889 by @ClearlyClaire and @Gargron)
@@ -113,21 +121,24 @@ The following changelog entries focus on changes visible to users, administrator
 - Add support for multiple `redirect_uris` when creating OAuth 2.0 Applications (#29192 by @ThisIsMissEm)
 - Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap)
 - Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc)
-- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
 - Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan)
 - Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, and #30858 by @ClearlyClaire, @Gargron, and @mjankowski)\
   Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\
   This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\
   This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future.
+- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
+- Add anchors to each authorized application in `/oauth/authorized_applications` (#31677 by @fowl2)
 - Add active animation to header settings button (#30221, #30307, and #30388 by @daudix)
 - Add OpenTelemetry instrumentation (#30130, #30322, #30353, and #30350 by @julianocosta89, @renchap, and @robbkidd)\
   See https://docs.joinmastodon.org/admin/config/#otel for documentation
 - Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\
   This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index
+- Add support for CORS to `POST /oauth/revoke` (#31743 by @ClearlyClaire)
 - Add redirection back to previous page after site upload deletion (#30141 by @FawazFarid)
 - Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm)
 - Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire)
 - Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm)
+- Add global Regexp timeout (#31928 by @ClearlyClaire)
 - Add the role ID to the badge component (#29707 by @renchap)
 - Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski)
 - Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski)
@@ -156,14 +167,14 @@ The following changelog entries focus on changes visible to users, administrator
 - **Change icons throughout the web interface** (#27385, #27539, #27555, #27579, #27700, #27817, #28519, #28709, #28064, #28775, #28780, #27924, #29294, #29395, #29537, #29569, #29610, #29612, #29649, #29844, #27780, #30974, #30963, #30962, #30961, #31362, #31363, #31359, #31371, #31360, #31512, #31511, and #31525 by @ClearlyClaire, @Gargron, @arbolitoloco1, @mjankowski, @nclm, @renchap, @ronilaukkarinen, and @zunda)\
   This changes all the interface icons from FontAwesome to Material Symbols for a more modern look, consistent with the official Mastodon Android app.\
   In addition, better care is given to pixel alignment, and icon variants are used to better highlight active/inactive state.
-- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, and #29659 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
+- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, #29659, and #31889 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
   The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\
   As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”.
-- **Change design of confirmation modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, and #31399 by @ClearlyClaire, @Gargron, and @tribela)\
+- **Change design of modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, #31399, #31555, #31752, #31801, #31883, #31844, #31864, and #31943 by @ClearlyClaire, @Gargron, @tribela and @vmstan)\
   The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\
   They also have a more modern and consistent design, along with other confirmation modals in the application.
 - **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
-- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878 and #29272 by @Gargron)
+- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878, #29272, and #31912 by @Gargron)
 - **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
   All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to read and keeping maximum compatibility across mail clients.
 - **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
@@ -171,19 +182,28 @@ The following changelog entries focus on changes visible to users, administrator
   In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\
   This change deprecates the `source` attribute in `Suggestion` entities in the REST API, and replaces it with the new [`sources` attribute](https://docs.joinmastodon.org/entities/Suggestion/#sources).
 - Change account search algorithm (#30803 by @Gargron)
-- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, and #30795 by @TheEssem, @ThisIsMissEm, @jippi, @timetinytim, and @vmstan)\
+- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, #30795, #31612, and #31615 by @TheEssem, @ThisIsMissEm, @jippi, @renchap, @timetinytim, and @vmstan)\
   In order to reduce the amount of runtime dependencies, the streaming server has been moved into a separate package and Docker image.\
   The `mastodon` image does not contain the streaming server anymore, as it has been moved to its own `mastodon-streaming` image.\
   Administrators may need to update their setup accordingly.
-- Change how content warnings and filters are displayed in web UI (#31365 by @Gargron)
+- Change how content warnings and filters are displayed in web UI (#31365, and #31761 by @Gargron)
+- Change preview card processing to ignore `undefined` as canonical url (#31882 by @oneiros)
+- Change embedded posts to use web UI (#31766 by @Gargron)
+- Change inner borders in media galleries in web UI (#31852 by @Gargron)
+- Change design of hide media button in web UI (#31807 by @Gargron)
+- Change labels on thread indicators in web UI (#31806 by @Gargron)
+- Change report action buttons to be disabled when action has already been taken (#31773, #31822, and #31899 by @ClearlyClaire and @ThisIsMissEm)
+- Change width of columns in advanced web UI (#31762 by @Gargron)
+- Change design of unread conversations in web UI (#31763 by @Gargron)
 - Change Web UI to allow viewing and severing relationships with suspended accounts (#27667 by @ClearlyClaire)\
   This also adds a `with_suspended` parameter to `GET /api/v1/accounts/relationships` in the REST API.
+- Change preview card image size limit from 2MB to 8MB when using libvips (#31904 by @ClearlyClaire)
 - Change avatars border radius (#31390 by @renchap)
 - Change counters to be displayed on profile timelines in web UI (#30525 by @Gargron)
 - Change disabled buttons color in light mode to make the difference more visible (#30998 by @renchap)
 - Change design of people tab on explore in web UI (#30059 by @Gargron)
 - Change sidebar text in web UI (#30696 by @Gargron)
-- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452 and #28465 by @Gargron and @renchap)
+- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452, #28465, and #31934 by @ClearlyClaire, @Gargron and @renchap)
 - Change media to be hidden/blurred by default in report modal (#28522 by @ClearlyClaire)
 - Change order of the "muting" and "blocking" list options in “Data Exports” (#26088 by @fixermark)
 - Change admin and moderation notes character limit from 500 to 2000 characters (#30288 by @ThisIsMissEm)
@@ -197,6 +217,7 @@ The following changelog entries focus on changes visible to users, administrator
 - Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532 by @Gargron)
 - Change back button to always appear in advanced web UI (#29551 and #29669 by @Gargron)
 - Change border of active compose field search inputs (#29832 and #29839 by @vmstan)
+- Change instances of Nokogiri HTML4 parsing to HTML5 (#31812, #31815, #31813, and #31814 by @flavorjones)
 - Change link detection to allow `@` at the end of an URL (#31124 by @adamniedzielski)
 - Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192 by @ClearlyClaire)
 - Change layout and wording of the Content Retention server settings page (#27733 by @vmstan)
@@ -249,8 +270,17 @@ The following changelog entries focus on changes visible to users, administrator
 - Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela)
 - Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski)
 - Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil)
+- Fix security context sometimes not being added in LD-Signed activities (#31871 by @ClearlyClaire)
 - Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77)
 - Fix cutoff of instance name in sign-up form (#30598 by @oneiros)
+- Fix invalid date searches returning 503 errors (#31526 by @notchairmk)
+- Fix invalid `visibility` values in `POST /api/v1/statuses` returning 500 errors (#31571 by @c960657)
+- Fix some components re-rendering spuriously in web UI (#31879 and #31881 by @ClearlyClaire and @Gargron)
+- Fix sort order of moderation notes on Reports and Accounts (#31528 by @ThisIsMissEm)
+- Fix email language when recipient has no selected locale (#31747 by @ClearlyClaire)
+- Fix frequently-used languages not correctly updating in the web UI (#31386 by @c960657)
+- Fix `POST /api/v1/statuses` silently ignoring invalid `media_ids` parameter (#31681 by @c960657)
+- Fix handling of the `BIND` environment variable in the streaming server (#31624 by @ThisIsMissEm)
 - Fix empty `aria-hidden` attribute value in logo resources area (#30570 by @mjankowski)
 - Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm)
 - Fix right-to-left text in preview cards (#30930 by @ClearlyClaire)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8053b436ce..c4e8cb7374 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
+    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 00e6160890..9b6ea2e4e5 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def default_prerelease
-      'beta.1'
+      'beta.2'
     end
 
     def prerelease

From 11de3dbef6fc719bd12379649a888ae84ad9b347 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 15:12:10 +0200
Subject: [PATCH 86/89] [Glitch] Enable grouped notifications unconditionally

Port c620452fd7e0e3b083bae4b68fa09384df322f4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/actions/markers.ts        |  8 +-----
 .../actions/notifications_migration.tsx       |  8 ++----
 .../flavours/glitch/actions/streaming.js      | 28 ++++++-------------
 .../components/column_settings.jsx            | 14 ----------
 .../glitch/features/notifications_wrapper.jsx |  7 +----
 .../ui/components/navigation_panel.jsx        | 11 +++-----
 .../flavours/glitch/initial_state.js          |  2 --
 .../flavours/glitch/selectors/settings.ts     |  5 ----
 8 files changed, 16 insertions(+), 67 deletions(-)

diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index 666756bcd1..37067dbcf7 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -2,7 +2,6 @@ import { debounce } from 'lodash';
 
 import type { MarkerJSON } from 'flavours/glitch/api_types/markers';
 import { getAccessToken } from 'flavours/glitch/initial_state';
-import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import type { AppDispatch, RootState } from 'flavours/glitch/store';
 import { createAppAsyncThunk } from 'flavours/glitch/store/typed_functions';
 
@@ -76,12 +75,7 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  return selectUseGroupedNotifications(state)
-    ? state.notificationGroups.lastReadId
-    : // @ts-expect-error state.notifications is not yet typed
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-      state.getIn(['notifications', 'lastReadId']);
+  return state.notificationGroups.lastReadId;
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
index 6789dbf38c..6f2d38b9e9 100644
--- a/app/javascript/flavours/glitch/actions/notifications_migration.tsx
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -1,14 +1,10 @@
-import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { createAppAsyncThunk } from 'flavours/glitch/store';
 
 import { fetchNotifications } from './notification_groups';
-import { expandNotifications } from './notifications';
 
 export const initializeNotifications = createAppAsyncThunk(
   'notifications/initialize',
-  (_, { dispatch, getState }) => {
-    if (selectUseGroupedNotifications(getState()))
-      void dispatch(fetchNotifications());
-    else void dispatch(expandNotifications({}));
+  (_, { dispatch }) => {
+    void dispatch(fetchNotifications());
   },
 );
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index e6eb7b2fad..7948984fba 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -1,7 +1,5 @@
 // @ts-check
 
-import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
-
 import { getLocale } from '../locales';
 import { connectStream } from '../stream';
 
@@ -105,18 +103,14 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
           const notificationJSON = JSON.parse(data.payload);
           dispatch(updateNotifications(notificationJSON, messages, locale));
           // TODO: remove this once the groups feature replaces the previous one
-          if(selectUseGroupedNotifications(getState())) {
-            dispatch(processNewNotificationForGroups(notificationJSON));
-          }
+          dispatch(processNewNotificationForGroups(notificationJSON));
           break;
         }
         case 'notifications_merged':
           const state = getState();
           if (state.notifications.top || !state.notifications.mounted)
             dispatch(expandNotifications({ forceLoad: true, maxId: undefined }));
-          if (selectUseGroupedNotifications(state)) {
-            dispatch(refreshStaleNotificationGroups());
-          }
+          dispatch(refreshStaleNotificationGroups());
           break;
         case 'conversation':
           // @ts-expect-error
@@ -141,21 +135,15 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
 
 /**
  * @param {Function} dispatch
- * @param {Function} getState
  */
-async function refreshHomeTimelineAndNotification(dispatch, getState) {
+async function refreshHomeTimelineAndNotification(dispatch) {
   await dispatch(expandHomeTimeline({ maxId: undefined }));
 
-  // TODO: remove this once the groups feature replaces the previous one
-  if(selectUseGroupedNotifications(getState())) {
-    // TODO: polling for merged notifications
-    try {
-      await dispatch(pollRecentGroupNotifications());
-    } catch {
-      // TODO
-    }
-  } else {
-    await dispatch(expandNotifications({}));
+  // TODO: polling for merged notifications
+  try {
+    await dispatch(pollRecentGroupNotifications());
+  } catch {
+    // TODO
   }
 
   await dispatch(fetchAnnouncements());
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
index 3bd040eb51..ea57f2999b 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -6,7 +6,6 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
-import { forceGroupedNotifications } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_REPORTS } from 'flavours/glitch/permissions';
 
 import ClearColumnButton from './clear_column_button';
@@ -36,7 +35,6 @@ class ColumnSettings extends PureComponent {
     const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
 
     const unreadMarkersShowStr = <FormattedMessage id='notifications.column_settings.unread_notifications.highlight' defaultMessage='Highlight unread notifications' />;
-    const groupingShowStr = <FormattedMessage id='notifications.column_settings.beta.grouping' defaultMessage='Group notifications' />;
     const filterBarShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show_bar' defaultMessage='Show filter bar' />;
     const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
@@ -79,18 +77,6 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
-        {!forceGroupedNotifications && (
-          <section role='group' aria-labelledby='notifications-beta'>
-            <h3 id='notifications-beta'>
-              <FormattedMessage id='notifications.column_settings.beta.category' defaultMessage='Experimental features' />
-            </h3>
-
-            <div className='column-settings__row'>
-              <SettingToggle id='unread-notification-markers' prefix='notifications' settings={settings} settingPath={['groupingBeta']} onChange={onChange} label={groupingShowStr} />
-            </div>
-          </section>
-        )}
-
         <section role='group' aria-labelledby='notifications-unread-markers'>
           <h3 id='notifications-unread-markers'>
             <FormattedMessage id='notifications.column_settings.unread_notifications.category' defaultMessage='Unread notifications' />
diff --git a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
index ab3eff889c..e19aa9d07d 100644
--- a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
+++ b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
@@ -1,13 +1,8 @@
-import Notifications from 'flavours/glitch/features/notifications';
 import Notifications_v2 from 'flavours/glitch/features/notifications_v2';
-import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
-import { useAppSelector } from 'flavours/glitch/store';
 
 export const NotificationsWrapper = (props) => {
-  const optedInGroupedNotifications = useAppSelector(selectUseGroupedNotifications);
-
   return (
-    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+    <Notifications_v2 {...props} />
   );
 };
 
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 905387caea..3e3fa5d9f1 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -36,7 +36,6 @@ import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
 import { canManageReports, canViewAdminDashboard } from 'flavours/glitch/permissions';
 import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
-import { selectUseGroupedNotifications } from 'flavours/glitch/selectors/settings';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
@@ -66,19 +65,17 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
-  const optedInGroupedNotifications = useSelector(selectUseGroupedNotifications);
-  const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
+  const count = useSelector(selectUnreadNotificationGroupsCount);
+  const showCount = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']));
   const intl = useIntl();
 
-  const newCount = useSelector(selectUnreadNotificationGroupsCount);
-
   return (
     <ColumnLink
       key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={optedInGroupedNotifications ? newCount : count} className='column-link__icon' />}
+      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={showCount ? count : 0} className='column-link__icon' />}
+      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={showCount ? count : 0} className='column-link__icon' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/flavours/glitch/initial_state.js b/app/javascript/flavours/glitch/initial_state.js
index ee8e901a4f..fd31b54e79 100644
--- a/app/javascript/flavours/glitch/initial_state.js
+++ b/app/javascript/flavours/glitch/initial_state.js
@@ -46,7 +46,6 @@
  * @property {boolean=} use_pending_items
  * @property {string} version
  * @property {string} sso_redirect
- * @property {boolean} force_grouped_notifications
  * @property {string} status_page_url
  * @property {boolean} system_emoji_font
  * @property {string} default_content_type
@@ -138,7 +137,6 @@ export const languages = initialState?.languages;
 export const criticalUpdatesPending = initialState?.critical_updates_pending;
 export const statusPageUrl = getMeta('status_page_url');
 export const sso_redirect = getMeta('sso_redirect');
-export const forceGroupedNotifications = getMeta('force_grouped_notifications');
 
 // Glitch-soc-specific settings
 export const maxFeedHashtags = (initialState && initialState.max_feed_hashtags) || 4;
diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
index c9cfd6dde5..9a1a2c990b 100644
--- a/app/javascript/flavours/glitch/selectors/settings.ts
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -1,4 +1,3 @@
-import { forceGroupedNotifications } from 'flavours/glitch/initial_state';
 import type { RootState } from 'flavours/glitch/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
@@ -26,10 +25,6 @@ export const selectSettingsNotificationsQuickFilterAdvanced = (
 ) =>
   state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
 
-export const selectUseGroupedNotifications = (state: RootState) =>
-  forceGroupedNotifications ||
-  (state.settings.getIn(['notifications', 'groupingBeta']) as boolean);
-
 export const selectSettingsNotificationsShowUnread = (state: RootState) =>
   state.settings.getIn(['notifications', 'showUnread']) as boolean;
 

From 93b2c8164ec40da95f138d0b038d018863eb7ea3 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 16 Sep 2024 16:51:56 +0200
Subject: [PATCH 87/89] [Glitch] Fix selectSettingsNotificationsExcludedTypes
 not being memoized properly

Port ca8e892c1abb91722c256030c83cabec8e3445ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/selectors/settings.ts     | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
index 9a1a2c990b..d66f00f0e1 100644
--- a/app/javascript/flavours/glitch/selectors/settings.ts
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -1,17 +1,27 @@
+import { createSelector } from '@reduxjs/toolkit';
+
 import type { RootState } from 'flavours/glitch/store';
 
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
 // state.settings is not yet typed, so we disable some ESLint checks for those selectors
-export const selectSettingsNotificationsShows = (state: RootState) =>
-  state.settings.getIn(['notifications', 'shows']).toJS() as Record<
-    string,
-    boolean
-  >;
+export const selectSettingsNotificationsShows = createSelector(
+  [
+    (state) =>
+      state.settings.getIn(['notifications', 'shows']) as Immutable.Map<
+        string,
+        boolean
+      >,
+  ],
+  (shows) => shows.toJS() as Record<string, boolean>,
+);
 
-export const selectSettingsNotificationsExcludedTypes = (state: RootState) =>
-  Object.entries(selectSettingsNotificationsShows(state))
-    .filter(([_type, enabled]) => !enabled)
-    .map(([type, _enabled]) => type);
+export const selectSettingsNotificationsExcludedTypes = createSelector(
+  [selectSettingsNotificationsShows],
+  (shows) =>
+    Object.entries(shows)
+      .filter(([_type, enabled]) => !enabled)
+      .map(([type, _enabled]) => type),
+);
 
 export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
   state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;

From a85b2476c21c975a84d33e504e3d9fcf02d794cc Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Mon, 16 Sep 2024 22:19:04 -0500
Subject: [PATCH 88/89] [Glitch] Fix background of text detection progress

Port 5a33a5658b904b97a664f18eaad6587c7c6cf04e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index f8ef556201..d58c54369d 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -4108,7 +4108,7 @@ input.glitch-setting-text {
   }
 
   &__wrapper {
-    background: $white;
+    background: $ui-base-color;
     border: 1px solid var(--background-border-color);
     margin-bottom: 10px;
     border-radius: 4px;

From 6bd86fede0a9171cf47e1dcf363bbcbd4e2c3068 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 17 Sep 2024 05:19:42 +0200
Subject: [PATCH 89/89] [Glitch] Increase no-gap-breakpoint by 32px to fix
 overflow

Port d2f907507857fb0d256c45dda34403ae1fe95cd8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/features/ui/components/columns_area.jsx   | 4 ++--
 app/javascript/flavours/glitch/styles/variables.scss          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
index e4c67ed65e..f76a8e5beb 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
@@ -64,8 +64,8 @@ export default class ColumnsArea extends ImmutablePureComponent {
     openSettings: PropTypes.func,
   };
 
-  // Corresponds to (max-width: $no-gap-breakpoint + 285px - 1px) in SCSS
-  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)');
+  // Corresponds to (max-width: $no-gap-breakpoint - 1px) in SCSS
+  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1206px)');
 
   state = {
     renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 8dd2cd0cda..111034fc62 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -87,7 +87,7 @@ $media-modal-media-max-width: 100%;
 // put margins on top and bottom of image to avoid the screen covered by image.
 $media-modal-media-max-height: 80%;
 
-$no-gap-breakpoint: 1175px;
+$no-gap-breakpoint: 1207px;
 $mobile-breakpoint: 630px;
 
 $font-sans-serif: 'mastodon-font-sans-serif' !default;