From c5f8256801c8c840becf0ea7201bb891adf3c35a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 03:45:59 -0400
Subject: [PATCH 01/11] Reduce extra factories in `FanOutOnWriteService` spec
 (#31053)

---
 .../services/fan_out_on_write_service_spec.rb | 85 ++++++++-----------
 1 file changed, 34 insertions(+), 51 deletions(-)

diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 82cdffb8cf..c6dd020cdf 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -34,21 +34,14 @@ RSpec.describe FanOutOnWriteService do
   context 'when status is public' do
     let(:visibility) { 'public' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
+    it 'adds status to home feed of author and followers and broadcasts', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+        .and be_in(home_feed_of(tom))
 
-    it 'is added to the home feed of a follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-      expect(home_feed_of(tom)).to include status.id
-    end
-
-    it 'is broadcast to the hashtag stream' do
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
       expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
-    end
-
-    it 'is broadcast to the public stream' do
       expect(redis).to have_received(:publish).with('timeline:public', anything)
       expect(redis).to have_received(:publish).with('timeline:public:local', anything)
       expect(redis).to have_received(:publish).with('timeline:public:media', anything)
@@ -58,60 +51,41 @@ RSpec.describe FanOutOnWriteService do
   context 'when status is limited' do
     let(:visibility) { 'limited' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
+    it 'adds status to home feed of author and mentioned followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+      expect(status.id)
+        .to_not be_in(home_feed_of(tom))
 
-    it 'is added to the home feed of the mentioned follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-    end
-
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
-    end
-
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
   end
 
   context 'when status is private' do
     let(:visibility) { 'private' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
+    it 'adds status to home feed of author and followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+        .and be_in(home_feed_of(tom))
 
-    it 'is added to the home feed of a follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-      expect(home_feed_of(tom)).to include status.id
-    end
-
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
   end
 
   context 'when status is direct' do
     let(:visibility) { 'direct' }
 
-    it 'is added to the home feed of its author' do
-      expect(home_feed_of(alice)).to include status.id
-    end
+    it 'is added to the home feed of its author and mentioned followers and does not broadcast', :inline_jobs do
+      expect(status.id)
+        .to be_in(home_feed_of(alice))
+        .and be_in(home_feed_of(bob))
+      expect(status.id)
+        .to_not be_in(home_feed_of(tom))
 
-    it 'is added to the home feed of the mentioned follower', :inline_jobs do
-      expect(home_feed_of(bob)).to include status.id
-    end
-
-    it 'is not added to the home feed of the other follower' do
-      expect(home_feed_of(tom)).to_not include status.id
-    end
-
-    it 'is not broadcast publicly' do
-      expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
-      expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+      expect_no_broadcasting
     end
 
     context 'when handling status updates' do
@@ -131,4 +105,13 @@ RSpec.describe FanOutOnWriteService do
       end
     end
   end
+
+  def expect_no_broadcasting
+    expect(redis)
+      .to_not have_received(:publish)
+      .with('timeline:hashtag:hoge', anything)
+    expect(redis)
+      .to_not have_received(:publish)
+      .with('timeline:public', anything)
+  end
 end

From 2616fde9e6edfbdbf31efad5d1818ad950ab4d4c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 03:49:44 -0400
Subject: [PATCH 02/11] Use change-requiring records in admin/reports
 controller spec (#31052)

---
 spec/controllers/admin/reports_controller_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 02760154fb..5849163b5f 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -64,7 +64,7 @@ describe Admin::ReportsController do
 
   describe 'POST #reopen' do
     it 'reopens the report' do
-      report = Fabricate(:report)
+      report = Fabricate(:report, action_taken_at: 3.days.ago)
 
       put :reopen, params: { id: report }
       expect(response).to redirect_to(admin_report_path(report))
@@ -89,7 +89,7 @@ describe Admin::ReportsController do
 
   describe 'POST #unassign' do
     it 'reopens the report' do
-      report = Fabricate(:report)
+      report = Fabricate(:report, assigned_account_id: Account.last.id)
 
       put :unassign, params: { id: report }
       expect(response).to redirect_to(admin_report_path(report))

From 64c7ffdc656135b7986ce92d645f5355f638cfe4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 09:53:36 +0200
Subject: [PATCH 03/11] chore(deps): update dependency ruby-vips to v2.2.2
 (#31050)

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

diff --git a/Gemfile.lock b/Gemfile.lock
index c3e3adbbf3..c9781a4050 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -766,8 +766,9 @@ GEM
     ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)

From 47ea83d2469e461b82e6d837ea83ad561128fe7a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 04:00:19 -0400
Subject: [PATCH 04/11] Reduce factory creation in
 `AP::ProcessStatusUpdateService` spec (#31051)

---
 .../process_status_update_service_spec.rb     | 101 +++++-------------
 1 file changed, 28 insertions(+), 73 deletions(-)

diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index e451d15dc0..a97e840802 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -40,14 +40,13 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
   end
 
   describe '#call' do
-    it 'updates text' do
+    it 'updates text and content warning' do
       subject.call(status, json, json)
-      expect(status.reload.text).to eq 'Hello universe'
-    end
-
-    it 'updates content warning' do
-      subject.call(status, json, json)
-      expect(status.reload.spoiler_text).to eq 'Show more'
+      expect(status.reload)
+        .to have_attributes(
+          text: eq('Hello universe'),
+          spoiler_text: eq('Show more')
+        )
     end
 
     context 'when the changes are only in sanitized-out HTML' do
@@ -67,12 +66,9 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits and does not mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -90,15 +86,9 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, or update text' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
       end
     end
@@ -137,19 +127,10 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, update text but does update tallies' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
-      end
-
-      it 'updates tallies' do
         expect(status.poll.reload.cached_tallies).to eq [4, 3]
       end
     end
@@ -189,19 +170,10 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits, mark status edited, update text, or update tallies' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.reload.edited?).to be false
-      end
-
-      it 'does not update the text' do
+        expect(status.reload).to_not be_edited
         expect(status.reload.text).to eq 'Hello world'
-      end
-
-      it 'does not update tallies' do
         expect(status.poll.reload.cached_tallies).to eq [0, 0]
       end
     end
@@ -213,13 +185,10 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         status.snapshot!(rate_limit: false)
       end
 
-      it 'does not create any edits' do
-        expect { subject.call(status, json, json) }.to_not(change { status.reload.edits.pluck(&:id) })
-      end
-
-      it 'does not update the text, spoiler_text or edited_at' do
+      it 'does not create any edits or update relevant attributes' do
         expect { subject.call(status, json, json) }
-          .to_not(change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
+          .to not_change { status.reload.edits.pluck(&:id) }
+          .and(not_change { status.reload.attributes.slice('text', 'spoiler_text', 'edited_at').values })
       end
     end
 
@@ -237,12 +206,9 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits or mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -261,12 +227,9 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'does not create any edits' do
+      it 'does not create any edits or mark status edited' do
         expect(status.reload.edits).to be_empty
-      end
-
-      it 'does not mark status as edited' do
-        expect(status.edited?).to be false
+        expect(status).to_not be_edited
       end
     end
 
@@ -412,11 +375,8 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'removes poll' do
+      it 'removes poll and records media change in edit' do
         expect(status.reload.poll).to be_nil
-      end
-
-      it 'records media change in edit' do
         expect(status.edits.reload.last.poll_options).to be_nil
       end
     end
@@ -442,26 +402,21 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
         subject.call(status, json, json)
       end
 
-      it 'creates a poll' do
+      it 'creates a poll and records media change in edit' do
         poll = status.reload.poll
 
         expect(poll).to_not be_nil
         expect(poll.options).to eq %w(Foo Bar Baz)
-      end
-
-      it 'records media change in edit' do
         expect(status.edits.reload.last.poll_options).to eq %w(Foo Bar Baz)
       end
     end
 
-    it 'creates edit history' do
+    it 'creates edit history and sets edit timestamp' do
       subject.call(status, json, json)
-      expect(status.edits.reload.map(&:text)).to eq ['Hello world', 'Hello universe']
-    end
-
-    it 'sets edited timestamp' do
-      subject.call(status, json, json)
-      expect(status.reload.edited_at.to_s).to eq '2021-09-08 22:39:25 UTC'
+      expect(status.edits.reload.map(&:text))
+        .to eq ['Hello world', 'Hello universe']
+      expect(status.reload.edited_at.to_s)
+        .to eq '2021-09-08 22:39:25 UTC'
     end
   end
 end

From 7d090b2ab6a76676c861f737c3b6922da8c1292b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 10:00:29 +0200
Subject: [PATCH 05/11] New Crowdin Translations (automated) (#31055)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/ga.json  |   76 +-
 app/javascript/mastodon/locales/kab.json |    4 +-
 config/locales/bg.yml                    |    2 +
 config/locales/devise.ga.yml             |    6 +
 config/locales/doorkeeper.ga.yml         |  144 ++
 config/locales/ga.yml                    | 1532 +++++++++++++++++++++-
 config/locales/gl.yml                    |    2 +
 config/locales/hi.yml                    |    2 +
 config/locales/hu.yml                    |    2 +-
 config/locales/simple_form.bg.yml        |    3 +
 config/locales/simple_form.ga.yml        |  265 ++++
 config/locales/sl.yml                    |    1 +
 config/locales/tr.yml                    |    1 +
 13 files changed, 1999 insertions(+), 41 deletions(-)

diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 468c7a03a1..8c5039e2a4 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -29,8 +29,8 @@
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
   "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
-  "account.featured_tags.last_status_never": "Níl postáil ar bith ann",
-  "account.featured_tags.title": "Haischlib {name}",
+  "account.featured_tags.last_status_never": "Gan aon phoist",
+  "account.featured_tags.title": "Haischlib faoi thrácht {name}",
   "account.follow": "Lean",
   "account.follow_back": "Leanúint ar ais",
   "account.followers": "Leantóirí",
@@ -38,7 +38,7 @@
   "account.followers_counter": "{count, plural, one {{counter} leantóir} other {{counter} leantóirí}}",
   "account.following": "Ag leanúint",
   "account.following_counter": "{count, plural, one {{counter} ag leanúint} other {{counter} ag leanúint}}",
-  "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
+  "account.follows.empty": "Ní leanann an t-úsáideoir seo aon duine go fóill.",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
   "account.in_memoriam": "Cuimhneachán.",
@@ -46,7 +46,7 @@
   "account.languages": "Athraigh teangacha foscríofa",
   "account.link_verified_on": "Seiceáladh úinéireacht an naisc seo ar {date}",
   "account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
-  "account.media": "Ábhair",
+  "account.media": "Meáin",
   "account.mention": "Luaigh @{name}",
   "account.moved_to": "Tá tugtha le fios ag {name} gurb é an cuntas nua atá acu ná:",
   "account.mute": "Balbhaigh @{name}",
@@ -66,7 +66,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} poist}}",
   "account.unblock": "Bain bac de @{name}",
   "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
-  "account.unblock_short": "Bain bac de",
+  "account.unblock_short": "Díbhlocáil",
   "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
   "account.unfollow": "Ná lean a thuilleadh",
   "account.unmute": "Díbhalbhaigh @{name}",
@@ -100,7 +100,7 @@
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
-  "bundle_column_error.error.title": "Ná habair!",
+  "bundle_column_error.error.title": "Ó, níl sé sin go maith!",
   "bundle_column_error.network.body": "Tharla earráid agus an leathanach á lódáil. Seans gur mar gheall ar fhadhb shealadach le do nasc idirlín nó i ndáil leis an bhfreastalaí seo atá sé.",
   "bundle_column_error.network.title": "Earráid líonra",
   "bundle_column_error.retry": "Bain triail as arís",
@@ -135,9 +135,9 @@
   "column_header.hide_settings": "Folaigh socruithe",
   "column_header.moveLeft_settings": "Bog an colún ar chlé",
   "column_header.moveRight_settings": "Bog an colún ar dheis",
-  "column_header.pin": "Greamaigh",
+  "column_header.pin": "Pionna",
   "column_header.show_settings": "Taispeáin socruithe",
-  "column_header.unpin": "Díghreamaigh",
+  "column_header.unpin": "Bain pionna",
   "column_subheading.settings": "Socruithe",
   "community.column_settings.local_only": "Áitiúil amháin",
   "community.column_settings.media_only": "Meáin Amháin",
@@ -161,7 +161,7 @@
   "compose_form.poll.switch_to_single": "Athraigh suirbhé chun cead a thabhairt do rogha amháin",
   "compose_form.poll.type": "Stíl",
   "compose_form.publish": "Postáil",
-  "compose_form.publish_form": "Foilsigh\n",
+  "compose_form.publish_form": "Post nua",
   "compose_form.reply": "Freagra",
   "compose_form.save_changes": "Nuashonrú",
   "compose_form.spoiler.marked": "Bain rabhadh ábhair",
@@ -291,7 +291,7 @@
   "filter_modal.added.short_explanation": "Cuireadh an postáil seo leis an gcatagóir scagaire seo a leanas: {title}.",
   "filter_modal.added.title": "Scagaire curtha leis!",
   "filter_modal.select_filter.context_mismatch": "ní bhaineann sé leis an gcomhthéacs seo",
-  "filter_modal.select_filter.expired": "as feidhm",
+  "filter_modal.select_filter.expired": "imithe in éag",
   "filter_modal.select_filter.prompt_new": "Catagóir nua: {name}",
   "filter_modal.select_filter.search": "Cuardaigh nó cruthaigh",
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
@@ -377,7 +377,7 @@
   "keyboard_shortcuts.boost": "Treisigh postáil",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.description": "Cuntas",
+  "keyboard_shortcuts.description": "Cur síos",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
@@ -394,17 +394,17 @@
   "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "Oscail meáin",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
   "keyboard_shortcuts.reply": "Freagair ar phostáil",
   "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.search": "Díriú ar an mbosca cuardaigh",
+  "keyboard_shortcuts.spoilers": "Taispeáin / folaigh réimse CW",
+  "keyboard_shortcuts.start": "Oscail an colún “tosaigh”",
+  "keyboard_shortcuts.toggle_hidden": "Taispeáin/folaigh an téacs taobh thiar de CW",
   "keyboard_shortcuts.toggle_sensitivity": "Taispeáin / cuir i bhfolach meáin",
   "keyboard_shortcuts.toot": "Cuir tús le postáil nua",
-  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.unfocus": "Unfocus cum textarea/search",
   "keyboard_shortcuts.up": "Bog suas ar an liosta",
   "lightbox.close": "Dún",
   "lightbox.compress": "Comhbhrúigh an bosca amhairc íomhá",
@@ -545,12 +545,12 @@
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
   "onboarding.action.back": "Tóg ar ais mé",
   "onboarding.actions.back": "Tóg ar ais mé",
-  "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_explore": "Tóg mé chun trending",
+  "onboarding.actions.go_to_home": "Tóg go dtí mo bheathú baile mé",
   "onboarding.compose.template": "Dia duit #Mastodon!",
   "onboarding.follows.empty": "Ar an drochuair, ní féidir aon torthaí a thaispeáint faoi láthair. Is féidir leat triail a bhaint as cuardach nó brabhsáil ar an leathanach taiscéalaíochta chun teacht ar dhaoine le leanúint, nó bain triail eile as níos déanaí.",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.lead": "Is é do bheathú baile an príomhbhealach chun taithí a fháil ar Mastodon. Dá mhéad daoine a leanann tú, is ea is gníomhaí agus is suimiúla a bheidh sé. Chun tú a chur ar bun, seo roinnt moltaí:",
+  "onboarding.follows.title": "Cuir do chuid fotha baile in oiriúint duit féin",
   "onboarding.profile.discoverable": "Déan mo phróifíl a fháil amach",
   "onboarding.profile.discoverable_hint": "Nuair a roghnaíonn tú infhionnachtana ar Mastodon, d’fhéadfadh do phoist a bheith le feiceáil i dtorthaí cuardaigh agus treochtaí, agus d’fhéadfaí do phróifíl a mholadh do dhaoine a bhfuil na leasanna céanna acu leat.",
   "onboarding.profile.display_name": "Ainm taispeána",
@@ -566,17 +566,17 @@
   "onboarding.share.message": "Is {username} mé ar #Mastodon! Tar lean mé ag {url}",
   "onboarding.share.next_steps": "Na chéad chéimeanna eile is féidir:",
   "onboarding.share.title": "Roinn do phróifíl",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.lead": "Tá tú mar chuid de Mastodon anois, ardán meán sóisialta díláraithe uathúil ina ndéanann tú - ní algartam - do thaithí féin a choimeád. Cuirimis tús leat ar an teorainn shóisialta nua seo:",
+  "onboarding.start.skip": "Nach bhfuil cabhair uait le tosú?",
   "onboarding.start.title": "Tá sé déanta agat!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Say hello to the world.",
+  "onboarding.steps.follow_people.body": "Is éard atá i gceist le daoine suimiúla a leanúint ná Mastodon.",
+  "onboarding.steps.follow_people.title": "Cuir do chuid fotha baile in oiriúint duit féin",
+  "onboarding.steps.publish_status.body": "Abair heileo leis an domhan le téacs, grianghraif, físeáin nó pobalbhreith {emoji}",
   "onboarding.steps.publish_status.title": "Déan do chéad phostáil",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.setup_profile.body": "Cuir le d'idirghníomhaíochtaí trí phróifíl chuimsitheach a bheith agat.",
+  "onboarding.steps.setup_profile.title": "Déan do phróifíl a phearsantú",
+  "onboarding.steps.share_profile.body": "Cuir in iúl do do chairde conas tú a aimsiú ar Mastodon",
+  "onboarding.steps.share_profile.title": "Roinn do phróifíl Mastodon",
   "onboarding.tips.2fa": "<strong>An raibh a fhios agat?</strong> Is féidir leat do chuntas a dhéanamh slán trí fhíordheimhniú dhá fhachtóir a shocrú i socruithe do chuntais. Oibríonn sé le haon aip TOTP de do rogha féin, níl aon uimhir theileafóin riachtanach!",
   "onboarding.tips.accounts_from_other_servers": "<strong>An raibh a fhios agat?</strong> Ós rud é go bhfuil Mastodon díláraithe, déanfar roinnt próifílí a dtagann tú trasna orthu a óstáil ar fhreastalaithe seachas do fhreastalaithe. Agus fós is féidir leat idirghníomhú leo gan uaim! Tá an freastalaí acu sa dara leath dá n-ainm úsáideora!",
   "onboarding.tips.migration": "<strong>An raibh a fhios agat?</strong> Más dóigh leat nach rogha freastalaí iontach é {domain} amach anseo, is féidir leat bogadh go freastalaí Mastodon eile gan do leantóirí a chailliúint. Is féidir leat do fhreastalaí féin a óstáil fiú!",
@@ -594,7 +594,7 @@
   "poll.votes": "{votes, plural, one {# vóta} other {# vóta}}",
   "poll_button.add_poll": "Cruthaigh suirbhé",
   "poll_button.remove_poll": "Bain suirbhé",
-  "privacy.change": "Adjust status privacy",
+  "privacy.change": "Athraigh príobháideacht postála",
   "privacy.direct.long": "Luaigh gach duine sa phost",
   "privacy.direct.short": "Daoine ar leith",
   "privacy.private.long": "Do leanúna amháin",
@@ -687,8 +687,8 @@
   "search_popout.specific_date": "dáta ar leith",
   "search_popout.user": "úsáideoir",
   "search_results.accounts": "Próifílí",
-  "search_results.all": "Uile",
-  "search_results.hashtags": "Haischlibeanna",
+  "search_results.all": "Gach",
+  "search_results.hashtags": "Haischlib",
   "search_results.nothing_found": "Níorbh fhéidir aon rud a aimsiú do na téarmaí cuardaigh seo",
   "search_results.see_all": "Gach rud a fheicáil",
   "search_results.statuses": "Postálacha",
@@ -705,12 +705,12 @@
   "sign_in_banner.sso_redirect": "Logáil isteach nó Cláraigh",
   "status.admin_account": "Oscail comhéadan modhnóireachta do @{name}",
   "status.admin_domain": "Oscail comhéadan modhnóireachta le haghaidh {domain}",
-  "status.admin_status": "Open this status in the moderation interface",
+  "status.admin_status": "Oscail an postáil seo sa chomhéadan modhnóireachta",
   "status.block": "Bac @{name}",
   "status.bookmark": "Leabharmharcanna",
   "status.cancel_reblog_private": "Dímhol",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
-  "status.copy": "Copy link to status",
+  "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",
   "status.detailed_status": "Amharc comhrá mionsonraithe",
   "status.direct": "Luaigh @{name} go príobháideach",
@@ -734,11 +734,11 @@
   "status.more": "Tuilleadh",
   "status.mute": "Balbhaigh @{name}",
   "status.mute_conversation": "Balbhaigh comhrá",
-  "status.open": "Expand this status",
+  "status.open": "Leathnaigh an post seo",
   "status.pin": "Pionnáil ar do phróifíl",
   "status.pinned": "Postáil pionnáilte",
   "status.read_more": "Léan a thuilleadh",
-  "status.reblog": "Mol",
+  "status.reblog": "Treisiú",
   "status.reblog_private": "Mol le léargas bunúsach",
   "status.reblogged_by": "Mhol {name}",
   "status.reblogs": "{count, plural, one {buaic} other {buaic}}",
@@ -757,7 +757,7 @@
   "status.show_more": "Taispeáin níos mó",
   "status.show_more_all": "Taispeáin níos mó d'uile",
   "status.show_original": "Taispeáin bunchóip",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.title.with_attachments": "{user} a sheol {attachmentCount, plural, one {ceangal} two {{attachmentCount} ceangal} few {{attachmentCount} ceangail} many {{attachmentCount} ceangal} other {{attachmentCount} ceangal}}",
   "status.translate": "Aistrigh",
   "status.translated_from_with": "D'Aistrigh ón {lang} ag úsáid {provider}",
   "status.uncached_media_warning": "Níl an réamhamharc ar fáil",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index a5c3280712..ab0a6ce22b 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -28,7 +28,7 @@
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
   "account.follow": "Ḍfer",
-  "account.follow_back": "Ḍfer-it ula d kečč·m",
+  "account.follow_back": "Ḍfer-it ula d kečč·mm",
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{counter} n umḍfar} other {{counter} n yimeḍfaren}}",
@@ -38,6 +38,7 @@
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.joined_short": "Izeddi da seg ass n",
+  "account.languages": "Beddel tutlayin yettwajerden",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Timidyatin",
@@ -235,6 +236,7 @@
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
+  "follow_suggestions.popular_suggestion_longer": "Yettwassen deg {domain}",
   "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 602a26225c..c0abc3c845 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -226,6 +226,7 @@ bg:
         update_custom_emoji: Обновяване на персонализираното емоджи
         update_domain_block: Обновяване на блокирането за домейна
         update_ip_block: Обновяване на правило за IP
+        update_report: Обновяване на доклада
         update_status: Обновяване на публикация
         update_user_role: Обновяване на ролята
       actions:
@@ -638,6 +639,7 @@ bg:
       report: 'Докладване на #%{id}'
       reported_account: Докладван акаунт
       reported_by: Докладвано от
+      reported_with_application: Докладвано с приложението
       resolved: Разрешено
       resolved_msg: Успешно разрешен доклад!
       skip_to_actions: Прескок към действия
diff --git a/config/locales/devise.ga.yml b/config/locales/devise.ga.yml
index e083896f37..cc8ae0874e 100644
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@@ -116,3 +116,9 @@ ga:
       expired: imithe in éag, iarr ceann nua le do thoil
       not_found: níor aimsíodh é
       not_locked: nach raibh faoi ghlas
+      not_saved:
+        few: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        many: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        one: 'Chuir earráid 1 cosc ​​ar an %{resource} seo a shábháil:'
+        other: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
+        two: 'Chuir %{count} earráid cosc ​​ar an %{resource} seo a shábháil:'
diff --git a/config/locales/doorkeeper.ga.yml b/config/locales/doorkeeper.ga.yml
index 9ac4740691..09857768e3 100644
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@@ -5,7 +5,17 @@ ga:
       doorkeeper/application:
         name: Ainm feidhmchláir
         redirect_uri: Atreoraigh URI
+        scopes: Scóip
         website: Suíomh gréasáin feidhmchláir
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ní féidir blúire a bheith ann.
+              invalid_uri: caithfidh gur URI bailí é.
+              relative_uri: a bheith ina URI iomlán.
+              secured_uri: caithfidh gur URI HTTPS/SSL é.
   doorkeeper:
     applications:
       buttons:
@@ -16,38 +26,172 @@ ga:
         submit: Cuir isteach
       confirmations:
         destroy: An bhfuil tú cinnte?
+      edit:
+        title: Cuir feidhmchlár in eagar
+      form:
+        error: Úps! Seiceáil d'fhoirm le haghaidh earráidí féideartha
+      help:
+        native_redirect_uri: Úsáid %{native_redirect_uri} le haghaidh tástálacha logánta
+        redirect_uri: Úsáid líne amháin in aghaidh an URI
+        scopes: Scóipeanna ar leith le spásanna. Fág bán chun na scóip réamhshocraithe a úsáid.
       index:
         application: Ainm feidhmchláir
+        callback_url: URL aisghlaoch
         delete: Scrios
+        empty: Níl aon iarratais agat.
         name: Ainm
+        new: Feidhmchlár nua
+        scopes: Scóip
         show: Taispeáin
+        title: D'iarratais
+      new:
+        title: Feidhmchlár nua
       show:
+        actions: Gníomhartha
         application_id: Eochair chliaint
+        callback_urls: URLanna aisghlaoch
+        scopes: Scóip
         secret: Rún cliaint
         title: 'Ainm feidhmchláir: %{name}'
     authorizations:
       buttons:
         authorize: Ceadaigh
         deny: Diúltaigh
+      error:
+        title: Tharla earráid
+      new:
+        prompt_html: Ba mhaith le %{client_name} cead rochtain a fháil ar do chuntas. Is iarratas tríú páirtí é. <strong>Mura bhfuil muinín agat as, níor cheart duit é a údarú.</strong>
+        review_permissions: Ceadanna a athbhreithniú
+        title: Tá údarú ag teastáil
+      show:
+        title: Cóipeáil an cód údaraithe seo agus greamaigh don fheidhmchlár é.
     authorized_applications:
+      buttons:
+        revoke: Cúlghair
       confirmations:
         revoke: An bhfuil tú cinnte?
       index:
+        authorized_at: Ceadaithe ar %{date}
+        description_html: Is feidhmchláir iad seo ar féidir rochtain a fháil ar do chuntas leis an API. Má tá feidhmchláir ann nach n-aithníonn tú anseo, nó má tá feidhmchlár mí-iompair, is féidir leat a rochtain a chúlghairm.
+        last_used_at: Úsáidte an uair dheireanach ar %{date}
+        never_used: Ná húsáideadh
         scopes: Ceadanna
         superapp: Inmheánach
+        title: D’iarratais údaraithe
+    errors:
+      messages:
+        access_denied: Shéan úinéir na hacmhainne nó an freastalaí údaraithe an t-iarratas.
+        credential_flow_not_configured: Theip ar shreabhadh Dintiúir Pasfhocal Úinéir Acmhainne toisc go raibh Doorkeeper.configure.resource_owner_from_credentials díchumraithe.
+        invalid_client: Theip ar fhíordheimhniú cliant de bharr cliant anaithnid, níl fíordheimhniú cliant san áireamh, nó modh fíordheimhnithe nach dtacaítear leis.
+        invalid_grant: Tá an deonú údaraithe ar choinníoll neamhbhailí, imithe in éag, cúlghairthe, nach ionann é agus an URI atreoraithe a úsáideadh san iarratas ar údarú, nó gur eisíodh é chuig cliant eile.
+        invalid_redirect_uri: Níl an uri atreoraithe atá san áireamh bailí.
+        invalid_request:
+          missing_param: 'Paraiméadar riachtanach in easnamh: %{value}.'
+          request_not_authorized: Ní mór an t-iarratas a údarú. Tá an paraiméadar riachtanach chun iarratas a údarú in easnamh nó neamhbhailí.
+          unknown: Tá paraiméadar riachtanach in easnamh ar an iarratas, folaíonn sé luach paraiméadar nach dtacaítear leis, nó tá sé míchumtha ar shlí eile.
+        invalid_resource_owner: Níl na dintiúir úinéara acmhainne a soláthraíodh bailí, nó ní féidir úinéir na hacmhainne a aimsiú
+        invalid_scope: Tá an scóip iarrtha neamhbhailí, anaithnid nó míchumtha.
+        invalid_token:
+          expired: Chuaigh an comhartha rochtana in éag
+          revoked: Cúlghairmeadh an comhartha rochtana
+          unknown: Tá an comhartha rochtana neamhbhailí
+        resource_owner_authenticator_not_configured: Theip ar aimsiú Úinéir Acmhainne toisc go bhfuil Doorkeeper.configure.resource_owner_authenticator díchumraithe.
+        server_error: Tháinig an freastalaí údaraithe ar riocht gan choinne a chuir cosc ​​air an t-iarratas a chomhlíonadh.
+        temporarily_unavailable: Ní féidir leis an bhfreastalaí údaraithe an t-iarratas a láimhseáil mar gheall ar ró-ualú sealadach nó cothabháil an fhreastalaí.
+        unauthorized_client: Níl an cliant údaraithe an t-iarratas seo a dhéanamh leis an modh seo.
+        unsupported_grant_type: Ní thacaíonn an freastalaí údaraithe leis an gcineál deontais údaraithe.
+        unsupported_response_type: Ní thacaíonn an freastalaí údaraithe leis an gcineál freagartha seo.
+    flash:
+      applications:
+        create:
+          notice: Cruthaíodh feidhmchlár.
+        destroy:
+          notice: Scriosadh an feidhmchlár.
+        update:
+          notice: Feidhmchlár nuashonraithe.
+      authorized_applications:
+        destroy:
+          notice: Cúlghairmeadh an t-iarratas.
     grouped_scopes:
+      access:
+        read: Rochtain inléite-amháin
+        read/write: Léigh agus scríobh rochtain
+        write: Rochtain scríofa-amháin
       title:
         accounts: Cuntais
+        admin/accounts: Cuntas a riar
+        admin/all: Feidhmeanna riaracháin go léir
+        admin/reports: Tuarascálacha a riar
+        all: Rochtain iomlán ar do chuntas Mastodon
+        blocks: Bloic
         bookmarks: Leabharmharcanna
         conversations: Comhráite
+        crypto: Criptiú ceann-go-deireadh
         favourites: Ceanáin
         filters: Scagairí
+        follow: Leanann, Múchann agus Blocálann
         follows: Cuntais leanta
         lists: Liostaí
+        media: Ceangaltáin meán
+        mutes: Múchann
         notifications: Fógraí
+        profile: Do phróifíl Mastodon
+        push: Fógraí a bhrú
+        reports: Tuarascálacha
         search: Cuardaigh
         statuses: Postálacha
+    layouts:
+      admin:
+        nav:
+          applications: Feidhmchláir
+          oauth2_provider: Soláthraí OAuth2
+      application:
+        title: Tá údarú OAuth riachtanach
     scopes:
+      admin:read: léigh na sonraí go léir ar an bhfreastalaí
+      admin:read:accounts: faisnéis íogair na gcuntas go léir a léamh
+      admin:read:canonical_email_blocks: léigh faisnéis íogair ar gach bloc ríomhphoist canónach
+      admin:read:domain_allows: léigh faisnéis íogair gach fearainn
+      admin:read:domain_blocks: léigh faisnéis íogair gach bloc fearainn
+      admin:read:email_domain_blocks: léigh faisnéis íogair gach bloc fearainn ríomhphoist
+      admin:read:ip_blocks: léigh faisnéis íogair gach bloic IP
+      admin:read:reports: faisnéis íogair na dtuarascálacha agus na gcuntas tuairiscithe go léir a léamh
+      admin:write: na sonraí go léir ar an bhfreastalaí a mhodhnú
+      admin:write:accounts: gníomhartha modhnóireachta a dhéanamh ar chuntais
+      admin:write:canonical_email_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna ríomhphoist chanónacha
+      admin:write:domain_allows: gníomhartha modhnóireachta a dhéanamh ar cheadaíonn fearainn
+      admin:write:domain_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna fearainn
+      admin:write:email_domain_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna fearainn ríomhphoist
+      admin:write:ip_blocks: gníomhartha modhnóireachta a dhéanamh ar bhlocanna IP
+      admin:write:reports: gníomhartha modhnóireachta a dhéanamh ar thuarascálacha
+      crypto: úsáid criptiú ceann-go-ceann
+      follow: caidrimh chuntais a mhodhnú
+      profile: léigh faisnéis phróifíle do chuntais amháin
+      push: faigh do bhrúfhógraí
+      read: léigh sonraí do chuntais go léir
+      read:accounts: féach eolas cuntais
+      read:blocks: féach ar do bloic
+      read:bookmarks: féach ar do leabharmharcanna
       read:favourites: féach ar do cheanáin
+      read:filters: féach ar do chuid scagairí
+      read:follows: féach do chuid seo a leanas
+      read:lists: féach ar do liostaí
+      read:mutes: féach ar do bhalbh
+      read:notifications: féach ar do chuid fógraí
+      read:reports: féach ar do thuarascálacha
+      read:search: cuardach ar do shon
+      read:statuses: féach ar gach post
+      write: sonraí do chuntais go léir a mhodhnú
+      write:accounts: do phróifíl a mhodhnú
+      write:blocks: cuntais agus fearainn a bhlocáil
+      write:bookmarks: poist leabharmharcála
+      write:conversations: comhráite balbh agus scrios
+      write:favourites: poist is fearr leat
       write:filters: cruthaigh scagairí
+      write:follows: daoine a leanúint
       write:lists: cruthaigh liostaí
+      write:media: uaslódáil comhaid meáin
+      write:mutes: balbhaigh daoine agus comhráite
+      write:notifications: soiléir do chuid fógraí
+      write:reports: tuairisc a thabhairt do dhaoine eile
+      write:statuses: foilsigh poist
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index a3ad293e5b..370f3e82e6 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -3,13 +3,24 @@ ga:
   about:
     about_mastodon_html: 'Líonra sóisialta a sheasfaidh an aimsir: Gan fógraíocht, gan faire chorparáideach, le leagan amach eiticiúil agus dílárú. Bíodh do chuid sonraí agatsa féin le Mastodon!'
     contact_missing: Gan socrú
-    contact_unavailable: N/B
+    contact_unavailable: N/A
     hosted_on: Mastodon arna óstáil ar %{domain}
     title: Maidir le
   accounts:
     follow: Lean
+    followers:
+      few: Leantóirí
+      many: Leantóirí
+      one: Leantóir
+      other: LeantóiríLeantóirí
+      two: Leantóirí
     following: Ag leanúint
+    instance_actor_flash: Is gníomhaí fíorúil é an cuntas seo a úsáidtear chun an freastalaí féin agus ní aon úsáideoir aonair a léiriú. Úsáidtear é chun críocha cónaidhme agus níor cheart é a chur ar fionraí.
+    last_active: deireanach gníomhach
+    link_verified_on: Seiceáladh úinéireacht an naisc seo ar %{date}
     nothing_here: Níl rud ar bith anseo!
+    pin_errors:
+      following: Ní mór duit a bheith ag leanúint an duine is mian leat a fhormhuiniú cheana féin
     posts:
       few: Postálacha
       many: Postálacha
@@ -23,12 +34,17 @@ ga:
       title: Dean gníomh modhnóireachta ar %{acct}
     account_moderation_notes:
       create: Fág nóta
+      created_msg: Cruthaíodh nóta modhnóireachta go rathúil!
+      destroyed_msg: Nóta measarthachta scriosta go rathúil!
     accounts:
+      add_email_domain_block: Cuir bac ar fhearann ​​​​ríomhphoist
       approve: Faomh
+      approved_msg: D'éirigh le feidhmchlár sínithe %{username} a cheadú
       are_you_sure: An bhfuil tú cinnte?
       avatar: Abhatár
       by_domain: Fearann
       change_email:
+        changed_msg: D'éirigh leis an ríomhphost a athrú!
         current_email: Ríomhphost reatha
         label: Athraigh ríomhphost
         new_email: Ríomhphost nua
@@ -46,7 +62,9 @@ ga:
       delete: Scrios sonraí
       deleted: Scriosta
       demote: Ísligh
+      destroyed_msg: Tá sonraí %{username} ciúáilte anois le scriosadh gan mhoill
       disable: Reoigh
+      disable_sign_in_token_auth: Díchumasaigh fíordheimhniú comhartha r-phoist
       disable_two_factor_authentication: Díchumasaigh 2FA
       disabled: Reoite
       display_name: Ainm taispeána
@@ -55,22 +73,31 @@ ga:
       email: Ríomhphost
       email_status: Stádas ríomhphoist
       enable: Dí-reoigh
+      enable_sign_in_token_auth: Cumasaigh fíordheimhniú comhartha ríomhphoist
       enabled: Ar chumas
+      enabled_msg: D'éirigh le dí-reoite cuntas %{username}
       followers: Leantóirí
       follows: Ag leanúint
       header: Ceanntásc
+      inbox_url: URL an Bhosca Isteach
+      invite_request_text: Cúiseanna le bheith páirteach
+      invited_by: Ar cuireadh ó
       ip: IP
       joined: Cláraithe
       location:
         all: Uile
         local: Áitiúil
         remote: Cian
+        title: Suíomh
       login_status: Stádas logála isteach
+      media_attachments: Ceangaltáin meán
       memorialize: Déan cuntas chuimhneacháin de
       memorialized: Cuntas chuimhneacháin
+      memorialized_msg: D'éirigh le %{username} a iompú ina chuntas cuimhneacháin
       moderation:
         active: Gníomhach
         all: Uile
+        disabled: Faoi mhíchumas
         pending: Ar feitheamh
         silenced: Teoranta
         suspended: Ar fionraí
@@ -78,111 +105,389 @@ ga:
       moderation_notes: Nótaí modhnóireacht
       most_recent_activity: Gníomhaíocht is déanaí
       most_recent_ip: IP is déanaí
+      no_account_selected: Níor athraíodh aon chuntas mar níor roghnaíodh ceann ar bith
+      no_limits_imposed: Ní fhorchuirtear aon teorainneacha
+      no_role_assigned: Níl aon ról sannta
+      not_subscribed: Gan suibscríofa
+      pending: Athbhreithniú ar feitheamh
       perform_full_suspension: Fionraí
       previous_strikes: Cionta roimhe seo
+      previous_strikes_description_html:
+        few: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        many: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        one: Tá <strong>buail amháin</strong> ag an gcuntas seo.
+        other: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
+        two: Tá <strong>%{count}</strong> buailte ag an gcuntas seo.
       promote: Ardaigh
       protocol: Prótacal
       public: Poiblí
+      push_subscription_expires: Téann síntiús PuSH in éag
       redownload: Athnuaigh próifíl
+      redownloaded_msg: D'éirigh le hathnuachan próifíl %{username} ón mbunús
       reject: Diúltaigh
+      rejected_msg: D'éirigh le diúltú le feidhmchlár sínithe %{username}
+      remote_suspension_irreversible: Scriosadh sonraí an chuntais seo go do-aisiompaithe.
+      remote_suspension_reversible_hint_html: Cuireadh an cuntas ar fionraí ar a fhreastalaí, agus bainfear na sonraí go hiomlán ar %{date}. Go dtí sin, is féidir leis an gcianfhreastalaí an cuntas seo a chur ar ais gan aon drochéifeachtaí. Más mian leat sonraí uile an chuntais a bhaint láithreach, is féidir leat é sin a dhéanamh thíos.
       remove_avatar: Bain abhatár
       remove_header: Bain ceanntásc
+      removed_avatar_msg: D'éirigh leis an íomhá avatar %{username} a bhaint
+      removed_header_msg: D'éirigh le híomhá ceanntásc %{username} a bhaint
+      resend_confirmation:
+        already_confirmed: Tá an t-úsáideoir seo deimhnithe cheana féin
+        send: Seol an nasc deimhnithe arís
+        success: D'éirigh le nasc deimhnithe seolta!
       reset: Athshocraigh
       reset_password: Athshocraigh pasfhocal
       resubscribe: Athchláraigh
       role: Ról
       search: Cuardaigh
+      search_same_email_domain: Úsáideoirí eile a bhfuil an fearann ​​ríomhphoist céanna acu
+      search_same_ip: Úsáideoirí eile a bhfuil an IP céanna acu
+      security: Slándáil
       security_measures:
         only_password: Pasfhocal amháin
         password_and_2fa: Pasfhocal agus fíordheimhniú déshraithe
+      sensitive: Fórsa-íogair
       sensitized: Marcáladh mar íogair
+      shared_inbox_url: URL an bhosca isteach roinnte
+      show:
+        created_reports: Tuarascálacha déanta
+        targeted_reports: Thuairiscigh daoine eile
       silence: Teorannaigh
       silenced: Teoranta
       statuses: Postálacha
+      strikes: Stailceanna roimhe seo
       subscribe: Cláraigh
       suspend: Cuir ar fionraí
       suspended: Ar fionraí
+      suspension_irreversible: Scriosadh sonraí an chuntais seo go do-aisiompaithe. Is féidir leat an cuntas a chur ar fionraí chun é a dhéanamh inúsáidte ach ní dhéanfaidh sé aon sonraí a bhí aige roimhe seo a aisghabháil.
+      suspension_reversible_hint_html: Tá an cuntas curtha ar fionraí, agus bainfear na sonraí go hiomlán ar %{date}. Go dtí sin, is féidir an cuntas a chur ar ais gan aon drochthionchar. Más mian leat sonraí uile an chuntais a bhaint láithreach, is féidir leat é sin a dhéanamh thíos.
       title: Cuntais
+      unblock_email: Bain an bac den seoladh ríomhphoist
+      unblocked_email_msg: D'éirigh leis an mbac a bhain le seoladh ríomhphoist %{username}
+      unconfirmed_email: Ríomhphost neamhdheimhnithe
+      undo_sensitized: Cealaigh fórsa-íogair
+      undo_silenced: Cealaigh teorainn
+      undo_suspension: Cealaigh fionraí
+      unsilenced_msg: D'éirigh leis an teorainn chuntas %{username} a bhaint
+      unsubscribe: Díliostáil
+      unsuspended_msg: D'éirigh le dífhorlannú cuntas %{username}
       username: Ainm úsáideora
+      view_domain: Féach ar achoimre le haghaidh fearainn
       warn: Rabhadh a thabhairt
       web: Gréasán
+      whitelisted: Ceadaithe do chónaidhm
     action_logs:
       action_types:
+        approve_appeal: Achomharc a cheadú
+        approve_user: Úsáideoir a cheadú
         assigned_to_self_report: Sann Tuairisc
+        change_email_user: Athraigh Ríomhphost don Úsáideoir
+        change_role_user: Athrú Ról an Úsáideora
+        confirm_user: Deimhnigh Úsáideoir
         create_account_warning: Cruthaigh Rabhadh
+        create_announcement: Cruthaigh Fógra
+        create_canonical_email_block: Cruthaigh Bloc Ríomhphoist
+        create_custom_emoji: Cruthaigh Emoji Saincheaptha
+        create_domain_allow: Cruthaigh Ceadaigh Fearainn
+        create_domain_block: Cruthaigh Bloc Fearainn
+        create_email_domain_block: Cruthaigh Bloc Fearainn Ríomhphoist
         create_ip_block: Cruthaigh riail IP
+        create_unavailable_domain: Cruthaigh Fearann ​​Gan Fáil
         create_user_role: Cruthaigh Ról
         demote_user: Ísligh úsáideoir
         destroy_announcement: Scrios Fógra
+        destroy_canonical_email_block: Scrios Bloc Ríomhphoist
+        destroy_custom_emoji: Scrios Saincheaptha Emoji
+        destroy_domain_allow: Scrios Ceadaigh Fearainn
+        destroy_domain_block: Scrios Bloc Fearainn
+        destroy_email_domain_block: Scrios Bloc Fearainn R-phoist
+        destroy_instance: Fearann ​​Purge
         destroy_ip_block: Scrios riail IP
         destroy_status: Scrios Postáil
+        destroy_unavailable_domain: Scrios Fearann ​​Gan Fáil
         destroy_user_role: Scrios ról
+        disable_2fa_user: Díchumasaigh 2FA
+        disable_custom_emoji: Díchumasaigh Emoji Saincheaptha
+        disable_sign_in_token_auth_user: Díchumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
+        disable_user: Díchumasaigh Úsáideoir
+        enable_custom_emoji: Cumasaigh Emoji Saincheaptha
+        enable_sign_in_token_auth_user: Cumasaigh Fíordheimhniú Comhartha R-phoist don Úsáideoir
+        enable_user: Cumasaigh Úsáideoir
+        memorialize_account: Cuntas Cuimhneacháin
+        promote_user: Úsáideoir a chur chun cinn
+        reject_appeal: Diúltaigh Achomharc
+        reject_user: Diúltaigh Úsáideoir
         remove_avatar_user: Bain Abhatár
         reopen_report: Athoscail tuairisc
+        resend_user: Seol Ríomhphost Deimhnithe arís
         reset_password_user: Athshocraigh Pasfhocal
         resolve_report: Réitigh tuairisc
+        sensitive_account: Cuntas Íogair Fórsa
+        silence_account: Cuntas Teorainn
+        suspend_account: Cuntas a Fhionraí
         unassigned_report: Díshann Tuairisc
+        unblock_email_account: Bain an bac den seoladh ríomhphoist
+        unsensitive_account: Cealaigh Cuntas Íogair Fórsa
+        unsilence_account: Cealaigh an Cuntas Teorainn
+        unsuspend_account: Díghlasáil Cuntas
         update_announcement: Nuashonraigh Fógra
+        update_custom_emoji: Nuashonraigh Emoji Saincheaptha
+        update_domain_block: Nuashonraigh Emoji Saincheaptha
+        update_ip_block: Íoslódáil an riail IP
+        update_report: Tuairisc Nuashonraithe
         update_status: Nuashonraigh Postáil
         update_user_role: Nuashonraigh Ról
       actions:
+        approve_appeal_html: Cheadaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
+        approve_user_html: Cheadaigh %{name} clárú ó %{target}
+        assigned_to_self_report_html: Shann %{name} tuairisc %{target} dóibh féin
+        change_email_user_html: D'athraigh %{name} seoladh ríomhphoist úsáideora %{target}
+        change_role_user_html: D'athraigh %{name} ról %{target}
+        confirm_user_html: Dhearbhaigh %{name} seoladh ríomhphoist úsáideora %{target}
         create_account_warning_html: Sheol %{name} rabhadh chuig %{target}
+        create_announcement_html: Chruthaigh %{name} fógra nua %{target}
+        create_canonical_email_block_html: Chuir %{name} bac ar ríomhphost leis an hash %{target}
+        create_custom_emoji_html: D'uaslódáil %{name} emoji nua %{target}
+        create_domain_allow_html: Cheadaigh %{name} cónaidhm le fearann ​​%{target}
+        create_domain_block_html: "%{name} fearann ​​bactha %{target}"
+        create_email_domain_block_html: Chuir %{name} bac ar fhearann ​​ríomhphoist %{target}
+        create_ip_block_html: Chruthaigh %{name} riail don IP %{target}
+        create_unavailable_domain_html: Chuir %{name} deireadh leis an seachadadh chuig fearann ​​%{target}
+        create_user_role_html: Chruthaigh %{name} %{target} ról
+        demote_user_html: "%{name} úsáideoir scriosta %{target}"
+        destroy_announcement_html: "%{name} fógra scriosta %{target}"
+        destroy_canonical_email_block_html: "%{name} ríomhphost díchoiscthe leis an hash %{target}"
+        destroy_custom_emoji_html: Scriosadh %{name} emoji %{target}
+        destroy_domain_allow_html: Dhiúltaigh %{name} cónaidhm le fearann ​​%{target}
+        destroy_domain_block_html: "%{name} fearann ​​%{target} bainte de"
+        destroy_email_domain_block_html: "%{name} bain an bac den fhearann ​​ríomhphoist %{target}"
+        destroy_instance_html: Glanadh %{name} fearann ​​%{target}
+        destroy_ip_block_html: "%{name} scriosta riail le haghaidh IP %{target}"
+        destroy_status_html: Bhain %{name} postáil le %{target}
+        destroy_unavailable_domain_html: D'athchrom %{name} ar an seachadadh chuig fearann ​​%{target}
         destroy_user_role_html: Scrios %{name} ról %{target}
+        disable_2fa_user_html: Dhíchumasaigh %{name} riachtanas dhá fhachtóir don úsáideoir %{target}
+        disable_custom_emoji_html: Dhíchumasaigh %{name} emoji %{target}
+        disable_sign_in_token_auth_user_html: Dhíchumasaigh %{name} fíordheimhniú comhartha ríomhphoist le haghaidh %{target}
+        disable_user_html: "%{name} logáil isteach díchumasaithe d'úsáideoir %{target}"
+        enable_custom_emoji_html: "%{name} emoji cumasaithe %{target}"
+        enable_sign_in_token_auth_user_html: Chuir %{name} fíordheimhniú comhartha ríomhphoist ar chumas %{target}
+        enable_user_html: "%{name} logáil isteach cumasaithe don úsáideoir %{target}"
+        memorialize_account_html: Rinne %{name} cuntas %{target} a iompú ina leathanach cuimhneacháin
+        promote_user_html: Chuir %{name} úsáideoir %{target} chun cinn
+        reject_appeal_html: Dhiúltaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
+        reject_user_html: Dhiúltaigh %{name} síniú suas ó %{target}
+        remove_avatar_user_html: Bhain %{name} avatar %{target}
+        reopen_report_html: D'athoscail %{name} tuairisc %{target}
+        resend_user_html: "%{name} athsheoladh ríomhphost deimhnithe le haghaidh %{target}"
+        reset_password_user_html: Athshocraigh %{name} pasfhocal úsáideora %{target}
+        resolve_report_html: Réitigh %{name} tuairisc %{target}
+        sensitive_account_html: Mharcáil %{name} meán %{target} mar íogair
+        silence_account_html: Chuir %{name} teorainn le cuntas %{target}
+        suspend_account_html: Chuir %{name} cuntas %{target} ar fionraí
+        unassigned_report_html: "%{name} tuairisc neamhshannta %{target}"
+        unblock_email_account_html: Bhain %{name} seoladh ríomhphoist %{target} amach
+        unsensitive_account_html: "%{name} meán %{target} gan mharcáil mar íogair"
+        unsilence_account_html: Chealaigh %{name} teorainn chuntas %{target}
+        unsuspend_account_html: Níor chuir %{name} cuntas %{target} ar fionraí
+        update_announcement_html: "%{name} fógra nuashonraithe %{target}"
+        update_custom_emoji_html: "%{name} emoji nuashonraithe %{target}"
+        update_domain_block_html: "%{name} nuashonraithe bloc fearainn le haghaidh %{target}"
+        update_ip_block_html: D'athraigh %{name} riail an IP %{target}
+        update_report_html: "%{name} tuairisc nuashonraithe %{target}"
+        update_status_html: "%{name} postáil nuashonraithe faoi %{target}"
         update_user_role_html: D'athraigh %{name} ról %{target}
       deleted_account: cuntas scriosta
+      empty: Níor aimsíodh aon logaí.
+      filter_by_action: Scag de réir gnímh
+      filter_by_user: Scag de réir úsáideora
+      title: Loga iniúchta
+      unavailable_instance: "(ainm fearainn ar fáil)"
     announcements:
+      destroyed_msg: D'éirigh leis an bhfógra a scriosadh!
       edit:
         title: Cuir fógra in eagar
+      empty: Níor aimsíodh aon fhógraí.
       live: Beo
       new:
         create: Cruthaigh fógra
         title: Fógra nua
       publish: Foilsigh
+      published_msg: D’éirigh leis an bhfógra a fhoilsiú!
+      scheduled_for: Sceidealta le haghaidh %{time}
+      scheduled_msg: Tá an fógra le foilsiú!
       title: Fógraí
+      unpublish: Dífhoilsiú
+      unpublished_msg: D’éirigh leis an bhfógra neamhfhoilsithe!
+      updated_msg: D'éirigh leis an bhfógra a nuashonrú!
+    critical_update_pending: Nuashonrú criticiúil ar feitheamh
     custom_emojis:
+      assign_category: Sann catagóir
       by_domain: Fearann
+      copied_msg: Cruthaíodh cóip áitiúil den emoji go rathúil
       copy: Cóipeáil
+      copy_failed_msg: Níorbh fhéidir cóip áitiúil den emoji sin a dhéanamh
       create_new_category: Cruthaigh catagóir nua
       created_msg: Cruthaíodh emoji go rathúil!
       delete: Scrios
       destroyed_msg: Scriosadh emoji go rathúil!
       disable: Díchumasaigh
       disabled: Díchumasaithe
+      disabled_msg: D'éirigh leis an emoji sin a dhíchumasú
       emoji: Emoji
       enable: Cumasaigh
       enabled: Ar chumas
+      enabled_msg: D'éirigh leis an emoji sin a chumasú
+      image_hint: PNG nó GIF suas go %{size}
       list: Liosta
       listed: Liostaithe
+      new:
+        title: Cuir emoji saincheaptha nua leis
+      no_emoji_selected: Níor athraíodh emojis ar bith mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl cead agat an gníomh seo a dhéanamh
       overwrite: Forscríobh
+      shortcode: Gearrchód
+      shortcode_hint: 2 charachtar ar a laghad, gan ach carachtair alfa-uimhriúla agus béim ar leith
+      title: Emojis saincheaptha
       uncategorized: Neamhchatagóirithe
       unlist: Neamhliostaigh
       unlisted: Neamhliostaithe
+      update_failed_msg: Níorbh fhéidir an emoji sin a nuashonrú
+      updated_msg: D'éirigh le Emoji a nuashonrú!
       upload: Uaslódáil
     dashboard:
       active_users: úsáideoirí gníomhacha
+      interactions: idirghníomhaíochtaí
+      media_storage: Stóráil meáin
       new_users: úsáideoirí nua
       opened_reports: tuairiscí oscailte
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> achomharc ar feitheamh"
+        many: "<strong>%{count}</strong> achomharc ar feitheamh"
+        one: "<strong>%{count}</strong> ar feitheamh achomhairc"
+        other: "<strong>%{count}</strong> achomharc ar feitheamh"
+        two: "<strong>%{count}</strong> achomharc ar feitheamh"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        many: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        one: "<strong>%{count}</strong> tuairisc ar feitheamh"
+        other: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+        two: "<strong>%{count}</strong> tuairiscí ar feitheamh"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> hashtags ar feitheamh"
+        many: "<strong>%{count}</strong> hashtags ar feitheamh"
+        one: "<strong>%{count}</strong> hashtag ar feitheamh"
+        other: "<strong>%{count}</strong> hashtags ar feitheamh"
+        two: "<strong>%{count}</strong> hashtags ar feitheamh"
+      pending_users_html:
+        few: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        many: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        one: "<strong>%{count}</strong> úsáideoir ar feitheamh"
+        other: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+        two: "<strong>%{count}</strong> úsáideoirí ar feitheamh"
+      resolved_reports: tuarascálacha réitithe
       software: Bogearraí
+      sources: Foinsí sínithe
+      space: Úsáid spáis
       title: Deais
+      top_languages: Barr teangacha gníomhacha
+      top_servers: Barr freastalaithe gníomhacha
       website: Suíomh Gréasáin
     disputes:
       appeals:
+        empty: Níor aimsíodh aon achomharc.
         title: Achomhairc
     domain_allows:
+      add_new: Ceadaigh cónaidhm leis an bhfearann
+      created_msg: Ceadaíodh fearann ​​don chónaidhm go rathúil
+      destroyed_msg: Dícheadaíodh an fearann ​​ón gcónaidhm
       export: Easpórtáil
       import: Iompórtáil
+      undo: Dícheadaigh cónaidhm leis an bhfearann
     domain_blocks:
+      add_new: Cuir bloc fearainn nua leis
+      confirm_suspension:
+        cancel: Cealaigh
+        confirm: Fionraí
+        permanent_action: Má dhéantar an fionraí a chealú, ní dhéanfar aon sonraí nó gaol a athbhunú.
+        preamble_html: Tá tú ar tí <strong>%{domain}</strong> agus a fhofhearainn a chur ar fionraí.
+        remove_all_data: Bainfidh sé seo gach ábhar, meán agus sonraí próifíle do chuntais an fhearainn seo de do fhreastalaí.
+        stop_communication: Stopfaidh do fhreastalaí ag cumarsáid leis na freastalaithe seo.
+        title: Deimhnigh bloc fearainn le haghaidh %{domain}
+        undo_relationships: Déanfaidh sé seo aon ghaol leantach idir cuntais na bhfreastalaithe seo agus do chuid féin a chealú.
+      created_msg: Tá bloc fearainn á phróiseáil anois
+      destroyed_msg: Tá an bloc fearainn cealaithe
       domain: Fearann
+      edit: Cuir bloc fearainn in eagar
+      existing_domain_block: Chuir tú teorainneacha níos déine ar %{name} cheana féin.
+      existing_domain_block_html: Chuir tú teorainneacha níos déine ar %{name} cheana féin, ní mór duit <a href="%{unblock_url}">an bac a bhaint as</a> ar dtús.
       export: Easpórtáil
       import: Iompórtáil
       new:
+        create: Cruthaigh bloc
+        hint: Ní choiscfidh an bloc fearainn iontrálacha cuntais a chruthú sa bhunachar sonraí, ach cuirfidh sé modhanna modhnóireachta sonracha i bhfeidhm go haisghníomhach agus go huathoibríoch ar na cuntais sin.
         severity:
+          desc_html: Déanfaidh <strong>Teorainn</strong> postálacha ó chuntais ag an bhfearann ​​seo dofheicthe d'aon duine nach bhfuil á leanúint. Bainfidh <strong>Fionraí</strong> gach ábhar, meán agus sonraí próifíle do chuntais an fhearainn seo de do fhreastalaí. Úsáid <strong>Dada</strong> más mian leat comhaid meán a dhiúltú.
+          noop: Dada
           silence: Teorannaigh
           suspend: Cuir ar fionraí
+        title: Bloc fearainn nua
+      no_domain_block_selected: Níor athraíodh aon bhloc fearainn mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl cead agat an gníomh seo a dhéanamh
+      obfuscate: Obfuscate ainm fearainn
+      obfuscate_hint: Cuir bac páirteach ar an ainm fearainn sa liosta má tá fógraíocht ar an liosta teorainneacha fearainn cumasaithe
+      private_comment: Trácht príobháideach
+      private_comment_hint: Déan trácht ar an teorannú fearainn seo le haghaidh úsáid inmheánach ag na modhnóirí.
+      public_comment: Trácht poiblí
+      public_comment_hint: Déan trácht ar an teorannú fearainn seo don phobal i gcoitinne, má tá fógraíocht ar an liosta teorainneacha fearainn cumasaithe.
+      reject_media: Diúltaigh comhaid meán
+      reject_media_hint: Baintear comhaid meán atá stóráilte go háitiúil agus diúltaíonn sé aon cheann a íoslódáil amach anseo. Ní bhaineann le fionraí
+      reject_reports: Diúltaigh tuarascálacha
+      reject_reports_hint: Déan neamhaird de gach tuairisc a thagann ón bhfearann ​​seo. Ní bhaineann le fionraí
+      undo: Cealaigh bloc fearainn
+      view: Féach ar bhloc fearainn
     email_domain_blocks:
+      add_new: Cuir nua leis
+      allow_registrations_with_approval: Ceadaigh clárúcháin le ceadú
+      attempts_over_week:
+        few: "%{count} iarracht chun síniú suas le seachtain anuas"
+        many: "%{count} iarracht chun síniú suas le seachtain anuas"
+        one: "%{count} iarracht le seachtain anuas"
+        other: "%{count} iarracht chun síniú suas le seachtain anuas"
+        two: "%{count} iarracht chun síniú suas le seachtain anuas"
+      created_msg: D'éirigh leis an bhfearann ​​ríomhphoist a bhlocáil
       delete: Scrios
+      dns:
+        types:
+          mx: Taifead MX
       domain: Fearann
+      new:
+        create: Cuir fearann ​​leis
+        resolve: Réitigh fearann
+        title: Cuir bac ar fhearann ​​​​r-phoist nua
+      no_email_domain_block_selected: Níor athraíodh aon bhloc fearainn ríomhphoist mar níor roghnaíodh ceann ar bith
+      not_permitted: Níl sé ceadaithe
+      resolved_dns_records_hint_html: Réitíonn an t-ainm fearainn chuig na fearainn MX seo a leanas, atá freagrach sa deireadh as glacadh le ríomhphost. Má dhéantar fearann ​​MX a bhlocáil, cuirfear bac ar chlárúcháin ó aon seoladh ríomhphoist a úsáideann an fearann ​​MX céanna, fiú má tá an t-ainm fearainn infheicthe difriúil. <strong>Bí cúramach gan bac a chur ar phríomhsholáthraithe ríomhphoist.</strong>
+      resolved_through_html: Réitithe trí %{domain}
+      title: Fearainn ríomhphoist bactha
+    export_domain_allows:
+      new:
+        title: Ceadaíonn fearann ​​​​iomportála
+      no_file: Níor roghnaíodh aon chomhad
+    export_domain_blocks:
+      import:
+        description_html: Tá tú ar tí liosta de bhlocanna fearainn a allmhairiú. Athbhreithnigh an liosta seo go han-chúramach, le do thoil, go háirithe murar scríobh tú féin an liosta seo.
+        existing_relationships_warning: Caidreamh leantach atá ann cheana féin
+        private_comment_description_html: 'Chun cabhrú leat teacht ar cad as a dtagann bloic iompórtáilte, cruthófar bloic iompórtáilte leis an nóta tráchta príobháideach seo a leanas: <q> %{comment}</q>'
+        private_comment_template: Iompórtáilte ó %{source} ar %{date}
+        title: Iompórtáil bloic fearainn
+      invalid_domain_block: 'Léiríodh bloc fearainn amháin nó níos mó mar gheall ar an earráid(í): %{error}'
+      new:
+        title: Iompórtáil bloic fearainn
+      no_file: Níor roghnaíodh aon chomhad
     follow_recommendations:
+      description_html: "<strong>Lean na moltaí cabhraíonn sé le húsáideoirí nua ábhar suimiúil a aimsiú go tapa</strong>. Nuair nach mbíonn go leor idirghníomhaithe ag úsáideoir le daoine eile chun moltaí pearsantaithe a leanúint, moltar na cuntais seo ina ionad sin. Déantar iad a athríomh ar bhonn laethúil ó mheascán de chuntais a bhfuil na rannpháirtíochtaí is airde acu le déanaí agus na háirimh áitiúla is airde leanúna do theanga ar leith."
       language: Don teanga
       status: Stádas
       suppress: Coisc moladh leanúna
@@ -190,36 +495,94 @@ ga:
       title: Moltaí leanúna
       unsuppress: Aischuir moladh leanúna
     instances:
+      availability:
+        description_html:
+          few: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          many: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          one: Má theipeann ar sheachadadh chuig an bhfearann ​​<strong>%{count} day</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          other: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+          two: Má theipeann ar sheachadadh chuig an bhfearann ​​ar <strong>%{count} laethanta éagsúla</strong> gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear <em>ó</em> seachadadh ón bhfearann.
+        failure_threshold_reached: Baineadh an tairseach teipe amach ar %{date}.
+        failures_recorded:
+          few: Theip ar iarrachtaí ar %{count} lá difriúil.
+          many: Theip ar iarrachtaí ar %{count} lá difriúil.
+          one: Theip ar iarracht ar %{count} lá.
+          other: Theip ar iarrachtaí ar %{count} lá difriúil.
+          two: Theip ar iarrachtaí ar %{count} lá difriúil.
+        no_failures_recorded: Uimh teipeanna ar taifead.
+        title: Infhaighteacht
+        warning: Níor éirigh leis an iarracht dheireanach chun ceangal leis an bhfreastalaí seo
       back_to_all: Uile
       back_to_limited: Teoranta
       back_to_warning: Rabhadh
       by_domain: Fearann
+      confirm_purge: An bhfuil tú cinnte gur mian leat sonraí a scriosadh go buan ón bhfearann ​​seo?
       content_policies:
         comment: Nóta inmheánach
+        description_html: Is féidir leat beartais inneachair a shainiú a chuirfear i bhfeidhm ar gach cuntas ón bhfearann ​​seo agus aon cheann dá fhofhearainn.
+        limited_federation_mode_description_html: Is féidir leat an rogha a dhéanamh maidir le cónaidhm a cheadú leis an bhfearann ​​seo.
         policies:
+          reject_media: Na meáin a dhiúltú
+          reject_reports: Diúltaigh tuarascálacha
           silence: Teorannaigh
           suspend: Cuir ar fionraí
         policy: Polasaí
+        reason: Cúis phoiblí
+        title: Polasaithe ábhair
       dashboard:
+        instance_accounts_dimension: Cuntais a lean a bhformhór
+        instance_accounts_measure: cuntais stóráilte
+        instance_followers_measure: ár leantóirí ann
+        instance_follows_measure: a lucht leanta anseo
         instance_languages_dimension: Teangacha is airde
+        instance_media_attachments_measure: ceangaltáin meáin stóráilte
+        instance_reports_measure: tuairiscí mar gheall orthu
+        instance_statuses_measure: postanna stóráilte
       delivery:
         all: Uile
+        clear: Earráidí seachadta soiléir
         failing: Ag teip
+        restart: Seachadadh a atosú
+        stop: Stad seachadadh
         unavailable: Níl ar fáil
+      delivery_available: Tá seachadadh ar fáil
+      delivery_error_days: Laethanta earráide seachadta
+      delivery_error_hint: Mura féidir seachadadh a dhéanamh ar feadh %{count} lá, marcálfar go huathoibríoch é mar dosheachadta.
+      destroyed_msg: Tá sonraí ó %{domain} ciúáilte anois le haghaidh scriosadh gan mhoill.
+      empty: Níor aimsíodh aon fhearainn.
+      known_accounts:
+        few: "%{count} cuntas aitheanta"
+        many: "%{count} cuntas aitheanta"
+        one: "%{count} cuntas aitheanta"
+        other: "%{count} cuntas aitheanta"
+        two: "%{count} cuntas aitheanta"
       moderation:
         all: Uile
         limited: Teoranta
+        title: Measarthacht
+      private_comment: Trácht príobháideach
+      public_comment: Trácht poiblí
       purge: Glan
+      purge_description_html: Má chreideann tú go bhfuil an fearann ​​seo as líne ar feadh tamaill mhaith, is féidir leat gach taifead cuntais agus sonraí gaolmhara ón bhfearann ​​​​seo a scriosadh ó do stór. Seans go dtógfaidh sé seo tamall.
       title: Cónascadh
+      total_blocked_by_us: Blocáilte ag dúinn
+      total_followed_by_them: Ina dhiaidh sin iad
       total_followed_by_us: Á leanúint againn
+      total_reported: Tuarascálacha mar gheall orthu
+      total_storage: Ceangaltáin meán
+      totals_time_period_hint_html: Áiríonn na hiomláin a thaispeántar thíos sonraí don am ar fad.
+      unknown_instance: Níl aon taifead den fhearann ​​seo ar an bhfreastalaí seo faoi láthair.
     invites:
+      deactivate_all: Díghníomhachtaigh go léir
       filter:
         all: Uile
         available: Ar fáil
+        expired: Imithe in éag
         title: Scag
       title: Cuirí
     ip_blocks:
       add_new: Cruthaigh riail
+      created_msg: Cuireadh riail IP nua leis go rathúil
       delete: Scrios
       expires_in:
         '1209600': Coicís
@@ -228,111 +591,609 @@ ga:
         '31556952': Bliain amháin
         '86400': Lá amháin
         '94670856': 3 bhliain
+      new:
+        title: Cruthaigh riail IP nua
+      no_ip_block_selected: Níor athraíodh aon rialacha IP mar níor roghnaíodh ceann ar bith
       title: Rialacha IP
+    relationships:
+      title: Caidrimh %{acct}
     relays:
+      add_new: Cuir sealaíochta nua leis
       delete: Scrios
+      description_html: Is freastalaí idirghabhálaí é <strong>athsheachadán cónaidhme</strong> a mhalartaíonn líon mór postálacha poiblí idir freastalaithe a shíníonn dó agus a fhoilsíonn é. <strong>Is féidir leis cabhrú le freastalaithe beaga agus meánmhéide inneachar a aimsiú ón bhfeideas</strong>, rud a d'éileodh ar úsáideoirí áitiúla daoine eile a leanúint de láimh ar fhreastalaithe cianda.
       disable: Díchumasaigh
       disabled: Díchumasaithe
       enable: Cumasaigh
+      enable_hint: Nuair a bheidh sé cumasaithe, liostóidh do fhreastalaí le gach postáil phoiblí ón athsheoladh seo, agus tosóidh sé ag seoladh postálacha poiblí an fhreastalaí seo chuige.
       enabled: Ar chumas
+      inbox_url: URL Athsheolta
+      pending: Ag fanacht le ceadú sealaíochta
       save_and_enable: Sábháil agus cumasaigh
+      setup: Socraigh nasc sealaíochta
+      signatures_not_enabled: Seans nach n-oibreoidh athsheachadáin i gceart agus mód slán nó modh cónaidhmthe teoranta cumasaithe
       status: Stádas
+      title: Athsheachadáin
+    report_notes:
+      created_msg: Cruthaíodh nóta tuairisce go rathúil!
+      destroyed_msg: D'éirigh leis an nóta tuairisce a scriosadh!
     reports:
+      account:
+        notes:
+          few: "%{count} nótaí"
+          many: "%{count} nótaí"
+          one: "%{count} nóta"
+          other: "%{count} nótaí"
+          two: "%{count} nótaí"
+      action_log: Loga iniúchta
+      action_taken_by: Gníomh arna ghlacadh ag
+      actions:
+        delete_description_html: Scriosfar na postálacha tuairiscithe agus déanfar stailc a thaifeadadh chun cabhrú leat dul in airde ar sháruithe sa todhchaí tríd an gcuntas céanna.
+        mark_as_sensitive_description_html: Déanfar na meáin sna poist tuairiscithe a mharcáil mar íogair agus déanfar stailc a thaifeadadh chun cabhrú leat sárú a dhéanamh ar sháruithe sa todhchaí tríd an gcuntas céanna.
+        other_description_html: Féach ar a thuilleadh roghanna chun iompar an chuntais a rialú agus cumarsáid a shaincheapadh chuig an gcuntas tuairiscithe.
+        resolve_description_html: Ní dhéanfar aon ghníomhaíocht i gcoinne an chuntais thuairiscithe, ní dhéanfar aon stailc a thaifeadadh, agus dúnfar an tuarascáil.
+        silence_description_html: Ní bheidh an cuntas le feiceáil ach amháin dóibh siúd a leanann é cheana féin nó a bhreathnaíonn suas de láimh air, rud a chuirfidh srian mór ar a rochtain. Is féidir é a chur ar ais i gcónaí. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+        suspend_description_html: Beidh an cuntas agus a bhfuil ann go léir dorochtana agus scriosfar iad ar deireadh, agus beidh sé dodhéanta idirghníomhú leis. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+      actions_description_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Má dhéanann tú beart pionósach in aghaidh an chuntais tuairiscithe, seolfar fógra ríomhphoist chucu, ach amháin nuair a roghnaítear an chatagóir <strong>Turscar</strong>.
+      actions_description_remote_html: Déan cinneadh ar an ngníomh atá le déanamh chun an tuarascáil seo a réiteach. Ní bheidh tionchar aige seo ach ar an gcaoi a ndéanann <strong>do fhreastalaí</strong> cumarsáid leis an gcianchuntas seo agus a láimhseálann sé a ábhar.
+      add_to_report: Cuir tuilleadh leis an tuairisc
+      already_suspended_badges:
+        local: Ar fionraí cheana féin ar an bhfreastalaí seo
+        remote: Ar fionraí cheana féin ar a bhfreastalaí
       are_you_sure: An bhfuil tú cinnte?
+      assign_to_self: Sann dom
+      assigned: Modhnóir sannta
+      by_target_domain: Fearann ​​an chuntais tuairiscithe
       cancel: Cealaigh
       category: Catagóir
+      category_description_html: Luafar an chúis ar tuairiscíodh an cuntas seo agus/nó an t-ábhar seo i gcumarsáid leis an gcuntas tuairiscithe
+      comment:
+        none: Dada
+      comment_description_html: 'Chun tuilleadh eolais a sholáthar, scríobh %{name}:'
+      confirm: Deimhnigh
+      confirm_action: Deimhnigh gníomh modhnóireachta i gcoinne @%{acct}
       created_at: Tuairiscithe
       delete_and_resolve: Scrios postálacha
+      forwarded: Ar aghaidh
+      forwarded_replies_explanation: Is ó chianúsáideoir an tuairisc seo agus faoi chianábhar. Tá sé curtha ar aghaidh chugat toisc go bhfuil an t-ábhar tuairiscithe mar fhreagra ar cheann de na húsáideoirí atá agat.
+      forwarded_to: Ar aghaidh chuig %{domain}
       mark_as_resolved: Marcáil mar réitithe
       mark_as_sensitive: Marcáil mar íogair
+      mark_as_unresolved: Marcáil mar gan réiteach
       no_one_assigned: Duine ar bith
       notes:
         create: Cruthaigh nóta
         create_and_resolve: Réitigh le nóta
+        create_and_unresolve: Oscail arís le nóta
         delete: Scrios
+        placeholder: Déan cur síos ar na bearta a rinneadh, nó ar aon nuashonruithe gaolmhara eile...
         title: Nótaí
+      notes_description_html: Féach ar agus fág nótaí do mhodhnóirí eile agus duit féin amach anseo
+      processed_msg: 'D''éirigh le próiseáil an tuairisc # %{id}'
+      quick_actions_description_html: 'Déan gníomh tapa nó scrollaigh síos chun ábhar tuairiscithe a fheiceáil:'
+      remote_user_placeholder: an cianúsáideoir ó %{instance}
+      reopen: Tuairisc a athoscailt
+      report: 'Tuairiscigh # %{id}'
+      reported_account: Cuntas tuairiscithe
+      reported_by: Tuairiscithe ag
+      reported_with_application: Tuairiscíodh leis an iarratas
+      resolved: Réitithe
+      resolved_msg: D'éirigh le réiteach an tuairisc!
+      skip_to_actions: Léim ar ghníomhartha
       status: Stádas
+      statuses: Ábhar tuairiscithe
+      statuses_description_html: Luafar ábhar ciontach i gcumarsáid leis an gcuntas tuairiscithe
+      summary:
+        action_preambles:
+          delete_html: 'Tá tú ar tí <strong>cuid de phostálacha </strong>@%{acct}<strong> a bhaint</strong>. Déanfaidh sé seo:'
+          mark_as_sensitive_html: 'Tá tú ar tí <strong>marcáil</strong> ar chuid de phostálacha <strong>@%{acct}</strong> mar <strong>íogair</strong>. Déanfaidh sé seo:'
+          silence_html: 'Tá tú ar tí <strong>teorannú</strong> a dhéanamh ar chuntas <strong>@%{acct}</strong>. Déanfaidh sé seo:'
+          suspend_html: 'Tá tú ar tí cuntas <strong>a chur ar fionraí</strong> <strong>@%{acct}</strong>. Déanfaidh sé seo:'
+        actions:
+          delete_html: Bain na postálacha ciontaithe
+          mark_as_sensitive_html: Marcáil meáin na bpost ciontaithe mar íogair
+          silence_html: Cuir teorainn mhór le rochtain <strong>@%{acct}</strong> trí a bpróifíl agus a n-inneachar a dhéanamh infheicthe ag daoine atá á leanúint cheana féin nó ag breathnú uirthi de láimh
+          suspend_html: Cuir <strong>@%{acct}</strong> ar fionraí, rud a fhágann go bhfuil a bpróifíl agus a bhfuil iontu dorochtana agus dodhéanta idirghníomhú leo
+        close_report: 'Marcáil an tuairisc #%{id} mar réitithe'
+        close_reports_html: Marcáil <strong>gach</strong> tuairisc in aghaidh <strong>@%{acct}</strong> mar réitithe
+        delete_data_html: Scrios próifíl agus inneachar <strong>@%{acct}</strong> 30 lá ó anois mura mbeidh siad curtha ar fionraí idir an dá linn
+        preview_preamble_html: 'Gheobhaidh <strong>@%{acct}</strong> rabhadh leis an ábhar seo a leanas:'
+        record_strike_html: Taifead stailc in aghaidh <strong>@%{acct}</strong> chun cabhrú leat dul i ngleic le sáruithe amach anseo ón gcuntas seo
+        send_email_html: Seol ríomhphost rabhaidh chuig <strong>@%{acct}</strong>
+        warning_placeholder: Réasúnaíocht bhreise roghnach don ghníomh modhnóireachta.
+      target_origin: Bunús an chuntais tuairiscithe
       title: Tuairiscí
+      unassign: Díshannadh
+      unknown_action_msg: 'Gníomh anaithnid: %{action}'
+      unresolved: Gan réiteach
+      updated_at: Nuashonraithe
+      view_profile: Féach ar phróifíl
     roles:
       add_new: Cruthaigh ról
+      assigned_users:
+        few: "%{count} úsáideoirí"
+        many: "%{count} úsáideoirí"
+        one: "%{count} úsáideoir"
+        other: "%{count} úsáideoirí"
+        two: "%{count} úsáideoirí"
       categories:
         administration: Riar
+        devops: DevOps
         invites: Cuirí
+        moderation: Measarthacht
+        special: Speisialta
       delete: Scrios
+      description_html: Le <strong>róil úsáideora</strong>, is féidir leat na feidhmeanna agus na réimsí de Mastodon ar féidir le d'úsáideoirí rochtain a fháil orthu a shaincheapadh.
+      edit: Cuir ról '%{name}' in eagar
+      everyone: Ceadanna réamhshocraithe
+      everyone_full_description_html: Seo é an <strong>bunról</strong> a théann i bhfeidhm ar <strong>gach úsáideoir</strong>, fiú iad siúd nach bhfuil ról sannta acu. Faigheann gach ról eile cead uaidh.
+      permissions_count:
+        few: "%{count} ceadanna"
+        many: "%{count} ceadanna"
+        one: "%{count} cead"
+        other: "%{count} ceadanna"
+        two: "%{count} ceadanna"
       privileges:
         administrator: Riarthóir
+        administrator_description: Seachnóidh úsáideoirí a bhfuil an cead seo acu gach cead
         delete_user_data: Scrios Sonraí Úsáideora
+        delete_user_data_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a scriosadh gan mhoill
+        invite_users: Tabhair cuireadh d'Úsáideoirí
+        invite_users_description: Ligeann sé d'úsáideoirí cuireadh a thabhairt do dhaoine nua chuig an bhfreastalaí
+        manage_announcements: Bainistigh Fógraí
+        manage_announcements_description: Ligeann sé d'úsáideoirí fógraí ar an bhfreastalaí a bhainistiú
+        manage_appeals: Achomharc a bhainistiú
+        manage_appeals_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar achomhairc i gcoinne gníomhartha modhnóireachta
+        manage_blocks: Bainistigh Bloic
+        manage_blocks_description: Ligeann sé d'úsáideoirí bac a chur ar sholáthraithe ríomhphoist agus seoltaí IP
+        manage_custom_emojis: Bainistigh Emojis Saincheaptha
+        manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí
+        manage_federation: Cónaidhm a bhainistiú
+        manage_federation_description: Ligeann sé d’úsáideoirí cónaidhm a bhlocáil nó a cheadú le fearainn eile, agus inseachadacht a rialú
+        manage_invites: Bainistigh Cuirí
+        manage_invites_description: Ligeann sé d'úsáideoirí naisc cuireadh a bhrabhsáil agus a dhíghníomhachtú
+        manage_reports: Tuarascálacha a bhainistiú
+        manage_reports_description: Ligeann sé d’úsáideoirí tuarascálacha a athbhreithniú agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
+        manage_roles: Bainistigh Róil
+        manage_roles_description: Ligeann sé d'úsáideoirí róil faoina gcuid féin a bhainistiú agus a shannadh
+        manage_rules: Rialacha a bhainistiú
+        manage_rules_description: Ligeann sé d'úsáideoirí rialacha freastalaí a athrú
+        manage_settings: Bainistigh Socruithe
+        manage_settings_description: Ligeann sé d'úsáideoirí socruithe suímh a athrú
+        manage_taxonomies: Tacsanomaíochtaí a bhainistiú
+        manage_taxonomies_description: Ligeann sé d'úsáideoirí athbhreithniú a dhéanamh ar inneachar treochta agus socruithe hashtag a nuashonrú
+        manage_user_access: Bainistigh Rochtain Úsáideoir
+        manage_user_access_description: Ligeann sé d'úsáideoirí fíordheimhniú dhá fhachtóir úsáideoirí eile a dhíchumasú, a seoladh r-phoist a athrú, agus a bpasfhocal a athshocrú
+        manage_users: Bainistigh Úsáideoirí
+        manage_users_description: Ligeann sé d'úsáideoirí sonraí úsáideoirí eile a fheiceáil agus gníomhartha modhnóireachta a dhéanamh ina gcoinne
+        manage_webhooks: Bainistigh cuacha Gréasáin
+        manage_webhooks_description: Ligeann sé d'úsáideoirí cuacha gréasáin a shocrú le haghaidh imeachtaí riaracháin
+        view_audit_log: Féach ar Loga Iniúchta
+        view_audit_log_description: Ligeann sé d'úsáideoirí stair gníomhartha riaracháin a fheiceáil ar an bhfreastalaí
+        view_dashboard: Amharc ar an Deais
+        view_dashboard_description: Ligeann sé d’úsáideoirí rochtain a fháil ar an deais agus ar mhéadrachtaí éagsúla
+        view_devops: DevOps
+        view_devops_description: Ligeann sé d’úsáideoirí rochtain a fháil ar dheais Sidekiq agus pgHero
       title: Róil
     rules:
       add_new: Cruthaigh riail
       delete: Scrios
+      description_html: Cé go maíonn a bhformhór gur léigh siad agus go n-aontaíonn siad leis na téarmaí seirbhíse, de ghnáth ní léann daoine tríd go dtí go dtagann fadhb chun cinn. <strong>Déan rialacha do fhreastalaí a fheiceáil go sracfhéachaint trí iad a sholáthar i liosta comhréidh de phointe urchair.</strong> Déan iarracht rialacha aonair a choinneáil gearr simplí, ach déan iarracht gan iad a roinnt ina go leor míreanna ar leith ach an oiread.
+      edit: Cuir riail in eagar
+      empty: Níl aon rialacha freastalaí sainmhínithe fós.
+      title: Rialacha freastalaí
     settings:
+      about:
+        manage_rules: Bainistigh rialacha freastalaí
+        preamble: Cuir eolas domhain ar fáil faoin gcaoi a n-oibrítear, a ndéantar modhnóireacht agus maoiniú ar an bhfreastalaí.
+        rules_hint: Tá réimse tiomnaithe rialacha ann a bhfuiltear ag súil go gcloífidh d’úsáideoirí leis.
+        title: Faoi
       appearance:
+        preamble: Saincheap comhéadan gréasáin Mastodon.
         title: Cuma
+      branding:
+        preamble: Déanann brandáil do fhreastalaí é a idirdhealú ó fhreastalaithe eile sa líonra. Féadfar an fhaisnéis seo a thaispeáint ar fud timpeallachtaí éagsúla, mar shampla comhéadan gréasáin Mastodon, feidhmchláir dhúchasacha, i réamhamhairc naisc ar láithreáin ghréasáin eile agus laistigh d’aipeanna teachtaireachtaí, agus mar sin de. Ar an ábhar sin, is fearr an fhaisnéis seo a choinneáil soiléir, gearr agus gonta.
+        title: Brandáil
+      captcha_enabled:
+        desc_html: Braitheann sé seo ar scripteanna seachtracha ó hCaptcha, rud a d’fhéadfadh a bheith ina ábhar imní maidir le slándáil agus príobháideacht. Ina theannta sin, <strong>is féidir leis seo an próiseas clárúcháin a dhéanamh i bhfad níos lú inrochtana ag roinnt daoine (go háirithe faoi mhíchumas)</strong>. Ar na cúiseanna seo, smaoinigh le do thoil ar bhearta eile amhail clárú bunaithe ar fhormheas nó ar chuireadh.
+        title: A cheangal ar úsáideoirí nua CAPTCHA a réiteach chun a gcuntas a dhearbhú
+      content_retention:
+        danger_zone: Crios contúirte
+        preamble: Rialú conas a stóráiltear ábhar a ghintear ag úsáideoirí i Mastodon.
+        title: Coinneáil ábhair
       default_noindex:
         desc_html: I bhfeidhm do ghach úsáideoir nár athraigh an socrú seo iad féin
         title: Diúltaigh d'innéacsú inneall cuardaigh mar réamhshocrú d'úsáideoirí
+      discovery:
+        follow_recommendations: Lean na moltaí
+        preamble: Tá sé ríthábhachtach dromchla a chur ar ábhar suimiúil chun úsáideoirí nua a chur ar bord nach bhfuil aithne acu ar dhuine ar bith Mastodon. Rialú conas a oibríonn gnéithe fionnachtana éagsúla ar do fhreastalaí.
+        profile_directory: Eolaire próifíle
+        public_timelines: Amlínte poiblí
+        publish_discovered_servers: Foilsigh freastalaithe aimsithe
+        publish_statistics: Staitisticí a fhoilsiú
+        title: Fionnachtain
+        trends: Treochtaí
+      domain_blocks:
+        all: Do chách
+        disabled: Do dhuine ar bith
+        users: Chun úsáideoirí áitiúla logáilte isteach
       registrations:
+        moderation_recommandation: Cinntigh le do thoil go bhfuil foireann mhodhnóireachta imoibríoch leordhóthanach agat sula n-osclaíonn tú clárúcháin do gach duine!
+        preamble: Rialú cé atá in ann cuntas a chruthú ar do fhreastalaí.
         title: Clárúcháin
+      registrations_mode:
+        modes:
+          approved: Teastaíonn ceadú le clárú
+          none: Ní féidir le duine ar bith clárú
+          open: Is féidir le duine ar bith clárú
+        warning_hint: Molaimid úsáid a bhaint as “Faomhadh riachtanach chun clárú” ach amháin má tá tú muiníneach gur féidir le d’fhoireann mhodhnóireachta clárú turscair agus mailíseach a láimhseáil go tráthúil.
+      security:
+        authorized_fetch: Teastaíonn fíordheimhniú ó fhreastalaithe cónasctha
+        authorized_fetch_hint: Toisc go n-éilítear fíordheimhniú ó fhreastalaithe cónasctha, is féidir bloic ar leibhéal an úsáideora agus ar leibhéal an fhreastalaí araon a fhorfheidhmiú níos déine. Mar sin féin, tagann sé seo ar chostas pionós feidhmíochta, laghdaítear an teacht ar do chuid freagraí, agus d'fhéadfadh saincheisteanna comhoiriúnachta a thabhairt isteach le roinnt seirbhísí cónasctha. Ina theannta sin, ní chuirfidh sé seo cosc ​​ar aisteoirí tiomnaithe do phoist phoiblí agus do chuntais phoiblí a fháil.
+        authorized_fetch_overridden_hint: Ní féidir leat an socrú seo a athrú faoi láthair toisc go bhfuil sé sáraithe ag athróg timpeallachta.
+        federation_authentication: Forghníomhú fíordheimhnithe Cónaidhm
+      title: Socruithe freastalaí
     site_uploads:
       delete: Scrios comhad uaslódáilte
+      destroyed_msg: D'éirigh le huaslódáil an tsuímh a scriosadh!
+    software_updates:
+      critical_update: Criticiúil - nuashonraigh go tapa le do thoil
+      description: Moltar do shuiteáil Mastodon a choinneáil cothrom le dáta chun leas a bhaint as na socruithe agus na gnéithe is déanaí. Ina theannta sin, tá sé ríthábhachtach uaireanta Mastodon a nuashonrú go tráthúil chun saincheisteanna slándála a sheachaint. Ar na cúiseanna seo, seiceálann Mastodon nuashonruithe gach 30 nóiméad, agus tabharfaidh sé fógra duit de réir do shainroghanna fógra ríomhphoist.
+      documentation_link: Foghlaim níos mó
+      release_notes: Nótaí scaoilte
+      title: Nuashonruithe ar fáil
+      type: Cineál
+      types:
+        major: Mórscaoileadh
+        minor: Mionscaoileadh
+        patch: Scaoileadh paiste - ceartúcháin agus athruithe atá éasca a chur i bhfeidhm
+      version: Leagan
     statuses:
       account: Údar
+      application: Iarratas
       back_to_account: Ar ais go leathanach cuntais
+      back_to_report: Ar ais go leathanach tuairisce
+      batch:
+        remove_from_report: Bain den tuairisc
+        report: Tuairisc
       deleted: Scriosta
       favourites: Toghanna
+      history: Stair leagan
+      in_reply_to: Ag freagairt do
       language: Teanga
       media:
         title: Meáin
       metadata: Meiteashonraí
+      no_status_selected: Níor athraíodh aon phostáil mar níor roghnaíodh ceann ar bith
       open: Oscail postáil
       original_status: Bunphostáil
       reblogs: Athbhlaganna
       status_changed: Athraíodh postáil
+      title: Poist chuntais
       trending: Ag treochtáil
+      visibility: Infheictheacht
       with_media: Le meáin
     strikes:
       actions:
         delete_statuses: Scrios %{name} postálacha de chuid %{target}
+        disable: Reoite %{name} cuntas %{target}
+        mark_statuses_as_sensitive: Mharcáil %{name} postálacha %{target} mar íogair
+        none: Sheol %{name} rabhadh chuig %{target}
+        sensitive: Mharcáil %{name} cuntas %{target} mar íogair
+        silence: Chuir %{name} teorainn le cuntas %{target}
+        suspend: Chuir %{name} cuntas %{target} ar fionraí
+      appeal_approved: Achomharc
+      appeal_pending: Achomharc ar feitheamh
+      appeal_rejected: Diúltaíodh don achomharc
+    system_checks:
+      database_schema_check:
+        message_html: Tá aistrithe bunachar sonraí ar feitheamh. Rith iad le do thoil chun a chinntiú go n-iompraíonn an t-iarratas mar a bhíothas ag súil leis
+      elasticsearch_health_red:
+        message_html: Tá braisle Elasticsearch míshláintiúil (stádas dearg), níl gnéithe cuardaigh ar fáil
+      elasticsearch_health_yellow:
+        message_html: Tá braisle Elasticsearch míshláintiúil (stádas buí), b'fhéidir gur mhaith leat an chúis a fhiosrú
+      elasticsearch_index_mismatch:
+        message_html: Tá mapálacha innéacs Elasticsearch as dáta. Rith <code>tootctl search deploy --only=%{value}</code> le do thoil
+      elasticsearch_preset:
+        action: Féach doiciméadú
+        message_html: Tá níos mó ná nód amháin ag do bhraisle Elasticsearch, ach níl Mastodon cumraithe chun iad a úsáid.
+      elasticsearch_preset_single_node:
+        action: Féach doiciméadú
+        message_html: Níl ach nód amháin ag do bhraisle Elasticsearch, ba cheart <code>ES_PRESET</code> a shocrú go <code>single_node_cluster</code>.
+      elasticsearch_reset_chewy:
+        message_html: Tá d'innéacs córais Elasticsearch as dáta mar gheall ar athrú socruithe. Rith <code>tootctl search deploy --reset-chewy</code> chun é a nuashonrú.
+      elasticsearch_running_check:
+        message_html: Níorbh fhéidir ceangal le Elasticsearch. Cinntigh go bhfuil sé ar siúl, nó díchumasaigh cuardach téacs iomlán
+      elasticsearch_version_check:
+        message_html: 'Leagan neamh-chomhoiriúnach le Elasticsearch: %{value}'
+        version_comparison: Tá Elasticsearch %{running_version} ag rith agus %{required_version} ag teastáil
+      rules_check:
+        action: Bainistigh rialacha freastalaí
+        message_html: Níl aon rialacha freastalaí sainmhínithe agat.
+      sidekiq_process_check:
+        message_html: Níl próiseas Sidekiq ag rith don scuaine/(scuainí) %{value}. Déan athbhreithniú ar do chumraíocht Sidekiq
+      software_version_critical_check:
+        action: Féach nuashonruithe atá ar fáil
+        message_html: Tá nuashonrú ríthábhachtach Mastodon ar fáil, nuashonraigh chomh tapa agus is féidir le do thoil.
+      software_version_patch_check:
+        action: Féach nuashonruithe atá ar fáil
+        message_html: Tá nuashonrú bugfix Mastodon ar fáil.
+      upload_check_privacy_error:
+        action: Seiceáil anseo le haghaidh tuilleadh eolais
+        message_html: "<strong>Tá do fhreastalaí gréasáin míchumraithe. Tá príobháideacht d'úsáideoirí i mbaol.</strong>"
+      upload_check_privacy_error_object_storage:
+        action: Seiceáil anseo le haghaidh tuilleadh eolais
+        message_html: "<strong>Tá do stór oibiachtaí míchumraithe. Tá príobháideacht d'úsáideoirí i mbaol.</strong>"
     tags:
       review: Stádas athbhreithnithe
+      updated_msg: D'éirigh le socruithe hashtag a nuashonrú
     title: Riar
     trends:
       allow: Ceadaigh
+      approved: Ceadaithe
       disallow: Dícheadaigh
+      links:
+        allow: Ceadaigh nasc
+        allow_provider: Ceadaigh foilsitheoir
+        description_html: Is naisc iad seo atá á roinnt go mór faoi láthair ag cuntais a bhfeiceann do fhreastalaí postálacha uathu. Is féidir leis cabhrú le d’úsáideoirí a fháil amach cad atá ar siúl ar fud an domhain. Ní thaispeánfar naisc ar bith go poiblí go dtí go gceadaíonn tú an foilsitheoir. Is féidir leat naisc aonair a cheadú nó a dhiúltú freisin.
+        disallow: Nasc a dhícheadú
+        disallow_provider: Dícheadaigh foilsitheoir
+        no_link_selected: Níor athraíodh aon nasc mar níor roghnaíodh ceann ar bith
+        publishers:
+          no_publisher_selected: Níor athraíodh aon fhoilsitheoir mar níor roghnaíodh ceann ar bith
+        shared_by_over_week:
+          few: Roinnte ag %{count} duine le seachtain anuas
+          many: Roinnte ag %{count} duine le seachtain anuas
+          one: Roinnte ag duine amháin le seachtain anuas
+          other: Roinnte ag %{count} duine le seachtain anuas
+          two: Roinnte ag %{count} duine le seachtain anuas
+        title: Naisc treochta
+        usage_comparison: Roinnte %{today} uair inniu, i gcomparáid le %{yesterday} inné
+      not_allowed_to_trend: Ní cheadaítear treocht
+      only_allowed: Ní cheadaítear ach
+      pending_review: Athbhreithniú ar feitheamh
       preview_card_providers:
+        allowed: Is féidir le naisc ón bhfoilsitheoir seo treocht
+        description_html: Is fearainn iad seo óna roinntear naisc go minic ar do fhreastalaí. Ní threochtóidh naisc go poiblí mura gceadaítear fearann ​​an naisc. Síneann do cheadú (nó diúltú) chuig fofhearainn.
+        rejected: Ní bheidh treocht ag naisc ón bhfoilsitheoir seo
         title: Foilsitheoirí
       rejected: Diúltaithe
       statuses:
         allow: Ceadaigh postáil
         allow_account: Ceadaigh údar
+        description_html: Is postálacha iad seo a bhfuil do fhreastalaí ar an eolas fúthu agus atá á roinnt faoi láthair agus is fearr leat go mór faoi láthair. Is féidir leis cabhrú le d’úsáideoirí nua agus úsáideoirí atá ag filleadh níos mó daoine a aimsiú le leanúint. Ní thaispeánfar postálacha ar bith go poiblí go dtí go gceadaíonn tú an t-údar, agus ceadaíonn an t-údar a gcuntas a mholadh do dhaoine eile. Is féidir leat postálacha aonair a cheadú nó a dhiúltú freisin.
+        disallow: Dícheadaigh postáil
+        disallow_account: Údar a dhícheadú
+        no_status_selected: Níor athraíodh aon phostáil treochta mar níor roghnaíodh ceann ar bith
+        not_discoverable: Níor roghnaigh an t-údar a bheith in-aimsithe
+        shared_by:
+          few: Roinnte agus ansa leat %{friendly_count} uair
+          many: Roinnte agus ansa leat %{friendly_count} uair
+          one: Roinnte nó is fearr leat am amháin
+          other: Roinnte agus ansa leat %{friendly_count} uair
+          two: Roinnte agus ansa leat %{friendly_count} uair
+        title: Poist trending
+      tags:
+        current_score: Scór reatha %{score}
+        dashboard:
+          tag_accounts_measure: úsáidí uathúla
+          tag_languages_dimension: Barrtheangacha
+          tag_servers_dimension: Barrtheangacha
+          tag_servers_measure: freastalaithe éagsúla
+          tag_uses_measure: úsáidí iomlána
+        description_html: Is hashtags iad seo atá le feiceáil faoi láthair i go leor postálacha a fheiceann do fhreastalaí. Is féidir leis cabhrú le d’úsáideoirí a fháil amach cad é is mó atá ag caint faoi dhaoine faoi láthair. Ní thaispeánfar aon hashtags go poiblí go dtí go gceadaíonn tú iad.
+        listable: Is féidir a mholadh
+        no_tag_selected: Níor athraíodh aon chlib mar níor roghnaíodh ceann ar bith
+        not_listable: Ní mholfar
+        not_trendable: Ní bheidh le feiceáil faoi threochtaí
+        not_usable: Ní féidir é a úsáid
+        peaked_on_and_decaying: Buaicphointe ar %{date}, ag lobhadh anois
+        title: Haischlib treochta
+        trendable: Is féidir le feiceáil faoi threochtaí
+        trending_rank: 'Ag treochtáil # %{rank}'
+        usable: Is féidir é a úsáid
+        usage_comparison: Úsáidte %{today} uair inniu, i gcomparáid le %{yesterday} inné
+        used_by_over_week:
+          few: Úsáidte ag %{count} duine le seachtain anuas
+          many: Úsáidte ag %{count} duine le seachtain anuas
+          one: Úsáidte ag duine amháin le seachtain anuas
+          other: Úsáidte ag %{count} duine le seachtain anuas
+          two: Úsáidte ag %{count} duine le seachtain anuas
+      title: Treochtaí
+      trending: Treocht
     warning_presets:
+      add_new: Cuir nua leis
       delete: Scrios
+      edit_preset: Cuir réamhshocrú rabhaidh in eagar
+      empty: Níl aon réamhshocruithe rabhaidh sainithe agat fós.
+      title: Réamhshocruithe rabhaidh
     webhooks:
+      add_new: Cuir críochphointe leis
       delete: Scrios
+      description_html: Cuireann <strong>cuadóg gréasáin</strong> ar chumas Mastodon <strong>fógraí fíor-ama</strong> faoi imeachtaí roghnaithe a bhrú le d'iarratas féin, ionas gur féidir le d'iarratas <strong>imoibrithe a spreagadh go huathoibríoch</strong>.
       disable: Díchumasaigh
       disabled: Díchumasaithe
+      edit: Cuir críochphointe in eagar
+      empty: Níl aon chríochphointí cuaille gréasáin agat fós.
       enable: Cumasaigh
       enabled: Gníomhach
+      enabled_events:
+        few: "%{count} imeacht cumasaithe"
+        many: "%{count} imeacht cumasaithe"
+        one: 1 imeacht cumasaithe
+        other: "%{count} imeacht cumasaithe"
+        two: "%{count} imeacht cumasaithe"
       events: Eachtraí
+      new: Cuaille gréasáin nua
+      rotate_secret: Rothlaigh an rún
+      secret: Rún a shíniú
       status: Stádas
+      title: Crúcaí gréasáin
+      webhook: Crúca gréasáin
   admin_mailer:
+    auto_close_registrations:
+      body: De bharr easpa gníomhaíochta modhnóra le déanaí, aistríodh clárúcháin ar %{instance} go huathoibríoch chuig athbhreithniú de láimh chun nach n-úsáidfear %{instance} mar ardán do dhrochghníomhaithe féideartha. Is féidir leat é a athrú ar ais chuig clárúcháin a oscailt am ar bith.
+      subject: Athraíodh clárúcháin le haghaidh %{instance} go huathoibríoch chuig a dteastaíonn ceadú uathu
     new_appeal:
       actions:
         delete_statuses: a gcuid postálacha a scrios
+        disable: a gcuntas a reo
+        mark_statuses_as_sensitive: a bpoist a mharcáil mar íogair
         none: rabhadh
+        sensitive: a gcuntas a mharcáil mar íogair
+        silence: a gcuntas a theorannú
+        suspend: a gcuntas a chur ar fionraí
+      body: 'Tá %{target} ag achomharc in aghaidh cinneadh modhnóireachta ó %{action_taken_by} ó %{date}, arbh é %{type} é. Scríobh siad:'
+      next_steps: Is féidir leat an t-achomharc a cheadú chun an cinneadh modhnóireachta a chealú, nó neamhaird a dhéanamh air.
+      subject: Tá %{username} ag achomharc in aghaidh cinneadh modhnóireachta ar %{instance}
+    new_critical_software_updates:
+      body: Tá leaganacha criticiúla nua de Mastodon eisithe, b'fhéidir gur mhaith leat a nuashonrú chomh luath agus is féidir!
+      subject: Tá nuashonruithe Critical Mastodon ar fáil do %{instance}!
+    new_pending_account:
+      body: Tá sonraí an chuntais nua thíos. Is féidir leat an t-iarratas seo a cheadú nó a dhiúltú.
+      subject: Cuntas nua le léirmheas ar %{instance} (%{username})
+    new_report:
+      body: Thuairiscigh %{reporter} %{target}
+      body_remote: Thuairiscigh duine éigin ó %{domain} %{target}
+      subject: Tuairisc nua do %{instance} (#%{id})
+    new_software_updates:
+      body: Tá leaganacha nua Mastodon eisithe, b'fhéidir gur mhaith leat a nuashonrú!
+      subject: Tá leaganacha nua Mastodon ar fáil do %{instance}!
+    new_trends:
+      body: 'Is gá na míreanna seo a leanas a athbhreithniú sular féidir iad a thaispeáint go poiblí:'
+      new_trending_links:
+        title: Naisc treochta
+      new_trending_statuses:
+        title: Poist trending
+      new_trending_tags:
+        title: Hashtags treochta
+      subject: Treochtaí nua le hathbhreithniú ar %{instance}
+  aliases:
+    add_new: Cruthaigh ailias
+    created_msg: D'éirigh le hailias nua a chruthú. Is féidir leat an t-aistriú ón seanchuntas a thionscnamh anois.
+    deleted_msg: D'éirigh leis an ailias a bhaint. Ní bheidh sé indéanta a thuilleadh bogadh ón gcuntas sin chuig an gceann seo.
+    empty: Níl aon ailiasanna agat.
+    hint_html: Más mian leat bogadh ó chuntas eile go dtí an ceann seo, anseo is féidir leat ailias a chruthú, a theastaíonn sular féidir leat leanúint ar aghaidh le leantóirí a bhogadh ón seanchuntas go dtí an ceann seo. Tá an gníomh seo ann féin <strong>neamhdhíobhálach agus inchúlaithe</strong>. <strong>Cuirtear tús leis an aistriú cuntais ón seanchuntas</strong>.
+    remove: Dícheangail ailias
+  appearance:
+    advanced_web_interface: Comhéadan gréasáin chun cinn
+    advanced_web_interface_hint: 'Más mian leat úsáid a bhaint as do leithead scáileáin ar fad, ceadaíonn an comhéadan gréasáin ardleibhéil duit go leor colúin éagsúla a chumrú chun an oiread faisnéise a fheiceáil ag an am céanna agus is mian leat: Baile, fógraí, amlíne chónaidhme, aon líon liostaí agus hashtags.'
+    animations_and_accessibility: Beochan agus inrochtaineacht
+    confirmation_dialogs: Dialóga deimhnithe
+    discovery: Fionnachtain
+    localization:
+      body: Aistríonn oibrithe deonacha Mastodon.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: Is féidir le gach duine rannchuidiú.
+    sensitive_content: Ábhar íogair
+  application_mailer:
+    notification_preferences: Athraigh roghanna ríomhphoist
+    salutation: "%{name},"
+    settings: 'Athraigh sainroghanna ríomhphoist: %{link}'
+    unsubscribe: Díliostáil
+    view: 'Amharc:'
+    view_profile: Féach ar phróifíl
+    view_status: Féach ar phostáil
+  applications:
+    created: D'éirigh leis an bhfeidhmchlár a chruthú
+    destroyed: D'éirigh leis an bhfeidhmchlár a scriosadh
+    logout: Logáil Amach
+    regenerate_token: Athghin comhartha rochtana
+    token_regenerated: D'éirigh le hathghiniúint an comhartha rochtana
+    warning: Bí an-chúramach leis na sonraí seo. Ná roinn é le haon duine riamh!
+    your_token: Do chomhartha rochtana
   auth:
+    apply_for_account: Iarr cuntas
+    captcha_confirmation:
+      help_html: Má tá fadhbanna agat ag réiteach an CAPTCHA, is féidir leat dul i dteagmháil linn trí %{email} agus is féidir linn cabhrú leat.
+      hint_html: Ach rud amháin eile! Ní mór dúinn a dhearbhú gur duine daonna thú (tá sé seo ionas gur féidir linn an turscar a choinneáil amach!). Réitigh an CAPTCHA thíos agus cliceáil "Ar aghaidh".
+      title: Seiceáil slándála
+    confirmations:
+      awaiting_review: Tá do sheoladh r-phoist deimhnithe! Tá do chlárúchán á athbhreithniú ag foireann %{domain} anois. Gheobhaidh tú r-phost má fhaomhann siad do chuntas!
+      awaiting_review_title: Tá do chlárú á athbhreithniú
+      clicking_this_link: ag cliceáil ar an nasc seo
+      login_link: logáil isteach
+      proceed_to_login_html: Is féidir leat dul ar aghaidh chuig %{login_link} anois.
+      redirect_to_app_html: Ba cheart go ndearnadh tú a atreorú chuig an aip <strong>%{app_name}</strong>. Murar tharla sin, bain triail as %{clicking_this_link} nó fill ar an aip de láimh.
+      registration_complete: Tá do chlárú ar %{domain} críochnaithe anois!
+      welcome_title: Fáilte, %{name}!
+      wrong_email_hint: Mura bhfuil an seoladh ríomhphoist sin ceart, is féidir leat é a athrú i socruithe cuntais.
     delete_account: Scrios cuntas
+    delete_account_html: Más mian leat do chuntas a scriosadh, is féidir leat <a href="%{path}">leanúint ar aghaidh anseo</a>. Iarrfar ort deimhniú.
+    description:
+      prefix_invited_by_user: Tugann @%{name} cuireadh duit páirt a ghlacadh sa fhreastalaí seo de Mastodon!
+      prefix_sign_up: Cláraigh ar Mastodon inniu!
+      suffix: Le cuntas, beidh tú in ann daoine a leanúint, nuashonruithe a phostáil agus teachtaireachtaí a mhalartú le húsáideoirí ó aon fhreastalaí Mastodon agus níos mó!
+    didnt_get_confirmation: Nach bhfuair tú nasc deimhnithe?
+    dont_have_your_security_key: Nach bhfuil d'eochair shlándála agat?
+    forgot_password: Ar rinne tú dearmad ar do Phásfhocail?
+    invalid_reset_password_token: Tá comhartha athshocraithe pasfhocail neamhbhailí nó imithe in éag. Iarr ceann nua le do thoil.
+    link_to_otp: Cuir isteach cód dhá fhachtóir ó do ghuthán nó cód aisghabhála
+    link_to_webauth: Úsáid d'eochair shlándála gléas
+    log_in_with: Logáil isteach le
     login: Logáil isteach
     logout: Logáil Amach
+    migrate_account: Bog chuig cuntas eile
+    migrate_account_html: Más mian leat an cuntas seo a atreorú chuig ceann eile, is féidir leat <a href="%{path}">é a chumrú anseo</a>.
     or_log_in_with: Nó logáil isteach le
+    privacy_policy_agreement_html: Léigh mé agus aontaím leis an <a href="%{privacy_policy_path}" target="_blank">polasaí príobháideachais</a>
+    progress:
+      confirm: Deimhnigh Ríomhphost
+      details: Do chuid sonraí
+      review: Ár léirmheas
+      rules: Glac le rialacha
+    providers:
+      cas: CAS
+      saml: SAML
     register: Clárú
+    registration_closed: Níl %{instance} ag glacadh le baill nua
+    resend_confirmation: Seol an nasc deimhnithe arís
+    reset_password: Athshocraigh pasfhocal
+    rules:
+      accept: Glac
+      back: Ar ais
+      invited_by: 'Is féidir leat páirt a ghlacadh i %{domain} a bhuíochas leis an gcuireadh a fuair tú ó:'
+      preamble: Socraíonn agus cuireann na modhnóirí %{domain} iad seo i bhfeidhm.
+      preamble_invited: Sula dtéann tú ar aghaidh, smaoinigh le do thoil ar na bunrialacha atá socraithe ag modhnóirí %{domain}.
+      title: Roinnt bunrialacha.
+      title_invited: Tá cuireadh faighte agat.
     security: Slándáil
+    set_new_password: Socraigh pasfhocal nua
+    setup:
+      email_below_hint_html: Seiceáil d'fhillteán turscair, nó iarr ceann eile. Is féidir leat do sheoladh r-phoist a cheartú má tá sé mícheart.
+      email_settings_hint_html: Cliceáil ar an nasc a sheol muid chugat chun %{email} a fhíorú. Beidh muid ag fanacht ar dheis anseo.
+      link_not_received: Nach bhfuair tú nasc?
+      new_confirmation_instructions_sent: Gheobhaidh tú r-phost nua leis an nasc deimhnithe i gceann cúpla bomaite!
+      title: Seiceáil do bhosca isteach
+    sign_in:
+      preamble_html: Logáil isteach le do dhintiúir <strong>%{domain}</strong>. Má tá do chuntas á óstáil ar fhreastalaí eile, ní bheidh tú in ann logáil isteach anseo.
+      title: Logáil isteach go %{domain}
+    sign_up:
+      manual_review: Téann clárúcháin ar %{domain} trí athbhreithniú láimhe ag ár modhnóirí. Chun cabhrú linn do chlárúchán a phróiseáil, scríobh beagán fút féin agus cén fáth a bhfuil cuntas uait ar %{domain}.
+      preamble: Le cuntas ar an bhfreastalaí Mastodon seo, beidh tú in ann aon duine eile ar an líonra a leanúint, beag beann ar an áit a bhfuil a gcuntas á óstáil.
+      title: Déanaimis tú a shocrú ar %{domain}.
     status:
       account_status: Stádas cuntais
+      confirming: Ag fanacht le deimhniú r-phoist a bheith críochnaithe.
+      functional: Tá do chuntas ag feidhmiú go hiomlán.
+      pending: Tá d’iarratas ar feitheamh athbhreithnithe ag ár bhfoireann. Seans go dtógfaidh sé seo roinnt ama. Gheobhaidh tú ríomhphost má cheadaítear d’iarratas.
+      redirecting_to: Tá do chuntas neamhghníomhach toisc go bhfuil sé á atreorú chuig %{acct} faoi láthair.
+      self_destruct: Toisc go bhfuil %{domain} ag dúnadh síos, ní bhfaighidh tú ach rochtain theoranta ar do chuntas.
+      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
   challenge:
     confirm: Lean ar aghaidh
+    hint_html: "<strong>Leid:</strong> Ní iarrfaimid do phasfhocal ort arís go ceann uair an chloig eile."
+    invalid_password: Pasfhocal neamhbhailí
+    prompt: Deimhnigh an pasfhocal chun leanúint ar aghaidh
+  crypto:
+    errors:
+      invalid_key: nach eochair bhailí Ed25519 nó Curve25519 í
+      invalid_signature: nach síniú bailí Ed25519 é
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count}u"
@@ -340,6 +1201,7 @@ ga:
       about_x_years: "%{count}b"
       almost_x_years: "%{count}b"
       half_a_minute: Díreach anois
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Díreach anois
       over_x_years: "%{count}b"
       x_days: "%{count}l"
@@ -347,45 +1209,243 @@ ga:
       x_months: "%{count}m"
       x_seconds: "%{count}s"
   deletes:
+    challenge_not_passed: Ní raibh an fhaisnéis a d'iontráil tú ceart
+    confirm_password: Cuir isteach do phasfhocal reatha chun d'aitheantas a fhíorú
+    confirm_username: Cuir isteach d'ainm úsáideora chun an nós imeachta a dhearbhú
     proceed: Scrios cuntas
+    success_msg: Scriosadh do chuntas go rathúil
+    warning:
+      before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
+      caches: Seans go seasfaidh inneachar atá i dtaisce ag freastalaithe eile
+      data_removal: Bainfear do phostálacha agus sonraí eile go buan
+      email_change_html: Is féidir leat <a href="%{path}">do sheoladh ríomhphoist a athrú</a> gan do chuntas a scriosadh
+      email_contact_html: Mura dtagann sé fós, is féidir leat ríomhphost a chur chuig <a href="mailto:%{email}">%{email}</a> chun cabhair a fháil
+      email_reconfirmation_html: Mura bhfuil an ríomhphost deimhnithe á fháil agat, is féidir <a href="%{path}">é a iarraidh arís</a>
+      irreversible: Ní bheidh tú in ann do chuntas a aischur nó a athghníomhachtú
+      more_details_html: Le haghaidh tuilleadh sonraí, féach an <a href="%{terms_path}">polasaí príobháideachais</a>.
+      username_available: Cuirfear d'ainm úsáideora ar fáil arís
+      username_unavailable: Ní bheidh d'ainm úsáideora ar fáil fós
   disputes:
     strikes:
+      action_taken: Gníomh déanta
+      appeal: Achomharc
+      appeal_approved: D’éirigh le hachomharc a dhéanamh ar an stailc seo agus níl sé bailí a thuilleadh
+      appeal_rejected: Diúltaíodh don achomharc
       appeal_submitted_at: Achomharc curtha isteach
       appealed_msg: Cuireadh isteach d'achomharc. Má ceadófar é, cuirfear ar an eolas tú.
       appeals:
         submit: Cuir achomharc isteach
+      approve_appeal: Achomharc a cheadú
+      associated_report: Tuarascáil ghaolmhar
+      created_at: Dátaithe
+      description_html: Is gníomhartha iad seo a rinneadh i gcoinne do chuntais agus rabhaidh a sheol foireann %{instance} chugat.
+      recipient: Seolta chuig
+      reject_appeal: Diúltú achomharc
+      status: 'Postáil # %{id}'
+      status_removed: Baineadh an postáil den chóras cheana féin
+      title: "%{action} ó %{date}"
       title_actions:
+        delete_statuses: Post a bhaint
+        disable: Reo cuntais
+        mark_statuses_as_sensitive: Postálacha a mharcáil mar íogair
         none: Rabhadh
+        sensitive: An cuntas a mharcáil mar íogair
+        silence: Teorainn le cuntas
+        suspend: Cuntas a fhionraí
+      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."
+    other: Eile
+  errors:
+    '400': Bhí an t-iarratas a chuir tú isteach neamhbhailí nó míchumtha.
+    '403': Níl cead agat an leathanach seo a fheiceáil.
+    '404': Níl an leathanach atá uait anseo.
+    '406': Níl an leathanach seo ar fáil san fhormáid iarrtha.
+    '410': Níl an leathanach a bhí á lorg agat ann a thuilleadh.
+    '422':
+      content: Theip ar fhíorú slándála. An bhfuil tú ag cur bac ar fhianáin?
+      title: Theip ar fhíorú slándála
+    '429': An iomarca iarratas
+    '500':
+      content: Tá brón orainn, ach chuaigh rud éigin mícheart ar ár deireadh.
+      title: Níl an leathanach seo ceart
+    '503': Níorbh fhéidir an leathanach a sheirbheáil mar gheall ar theip shealadach ar an bhfreastalaí.
+    noscript_html: Chun feidhmchlár gréasáin Mastodon a úsáid, cumasaigh JavaScript le do thoil. Nó, bain triail as ceann de na <a href="%{apps_path}">aipeanna dúchasacha</a> do Mastodon do d'ardán.
+  existing_username_validator:
+    not_found: níorbh fhéidir úsáideoir áitiúil a aimsiú leis an ainm úsáideora sin
+    not_found_multiple: níorbh fhéidir %{usernames} a aimsiú
   exports:
     archive_takeout:
       date: Dáta
+      download: Íosluchtaigh cartlann do rang
+      hint_html: Is féidir leat cartlann de do <strong>postálacha agus meáin uaslódáilte</strong> a iarraidh. Beidh na sonraí easpórtáilte i bhformáid ActivityPub, inléite ag aon bhogearraí comhlíontacha. Is féidir leat cartlann a iarraidh gach 7 lá.
+      in_progress: Do chartlann á tiomsú...
+      request: Iarr do chartlann
       size: Méid
+    blocks: Bac leat
+    bookmarks: Leabharmharcanna
+    csv: CSV
+    domain_blocks: Bloic fearainn
     lists: Liostaí
+    mutes: Balbhaíonn tú
+    storage: Stóráil meáin
+  featured_tags:
+    add_new: Cuir nua leis
+    errors:
+      limit: Tá uaslíon na hashtags le feiceáil agat cheana féin
+    hint_html: "<strong>Áirigh na haischlibeanna is tábhachtaí ar do phróifíl.</strong> Uirlis iontach chun súil a choinneáil ar do shaothair chruthaitheacha agus do thionscadail fhadtéarmacha, taispeántar haischlibeanna faoi thrácht in áit fheiceálach ar do phróifíl agus ceadaíonn siad rochtain thapa ar do phostálacha féin."
   filters:
     contexts:
+      account: Próifílí
       home: Baile agus liostaí
       notifications: Fógraí
+      public: Amlínte poiblí
       thread: Comhráite
     edit:
       add_keyword: Cruthaigh eochairfhocal
       keywords: Eochairfhocal
+      statuses: Poist aonair
+      statuses_hint_html: Baineann an scagaire seo le postálacha aonair a roghnú is cuma má mheaitseálann siad leis na heochairfhocail thíos. <a href="%{path}">Déan postálacha a athbhreithniú nó a bhaint den scagaire</a>.
+      title: Cuir an scagaire in eagar
+    errors:
+      deprecated_api_multiple_keywords: Ní féidir na paraiméadair seo a athrú ón bhfeidhmchlár seo toisc go mbaineann siad le níos mó ná eochairfhocal scagaire amháin. Úsáid feidhmchlár níos déanaí nó an comhéadan gréasáin.
+      invalid_context: Níor soláthraíodh aon cheann nó comhthéacs neamhbhailí
     index:
+      contexts: Scagairí i %{contexts}
       delete: Scrios
       empty: Níl aon scagairí agat.
+      expires_in: In éag i %{distance}
+      expires_on: Rachaidh sé in éag ar %{date}
+      keywords:
+        few: "%{count} eochairfhocal"
+        many: "%{count} eochairfhocal"
+        one: "%{count} eochairfhocal"
+        other: "%{count} eochairfhocal"
+        two: "%{count} eochairfhocal"
+      statuses:
+        few: "%{count} postáil"
+        many: "%{count} postáil"
+        one: "%{count} postáil"
+        other: "%{count} postáil"
+        two: "%{count} postáil"
+      statuses_long:
+        few: "%{count} postáil aonair folaithe"
+        many: "%{count} postáil aonair folaithe"
+        one: "%{count} postáil aonair i bhfolach"
+        other: "%{count} postáil aonair folaithe"
+        two: "%{count} postáil aonair folaithe"
       title: Scagairí
+    new:
+      save: Sábháil scagaire nua
+      title: Cuir scagaire nua leis
+    statuses:
+      back_to_filter: Ar ais go dtí an scagaire
+      batch:
+        remove: Bain as an scagaire
+      index:
+        hint: Baineann an scagaire seo le poist aonair a roghnú beag beann ar chritéir eile. Is féidir leat tuilleadh postálacha a chur leis an scagaire seo ón gcomhéadan gréasáin.
+        title: Postálacha scagtha
   generic:
+    all: Gach
+    all_items_on_page_selected_html:
+      few: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      many: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      one: Tá <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      other: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+      two: Tá gach <strong>%{count}</strong> mír ar an leathanach seo roghnaithe.
+    all_matching_items_selected_html:
+      few: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      many: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      one: Tá <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      other: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+      two: Tá gach <strong>%{count}</strong> mír a thagann le do chuardach roghnaithe.
+    cancel: Cealaigh
+    changes_saved_msg: Sábháladh na hathruithe!
+    confirm: Deimhnigh
     copy: Cóipeáil
     delete: Scrios
+    deselect: Díroghnaigh go léir
+    none: Dada
+    order_by: Ordú le
+    save_changes: Sabháil na hathruithe
+    select_all_matching_items:
+      few: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      many: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      one: Roghnaigh %{count} mír a thagann le do chuardach.
+      other: Roghnaigh gach %{count} mír a thagann le do chuardach.
+      two: Roghnaigh gach %{count} mír a thagann le do chuardach.
     today: inniu
+    validation_errors:
+      few: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      many: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      one: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar an earráid thíos
+      other: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
+      two: Níl rud éigin ceart go leor fós! Déan athbhreithniú ar %{count} earráid thíos
   imports:
+    errors:
+      empty: Comhad CSV folamh
+      incompatible_type: Neamh-chomhoiriúnach leis an gcineál iompórtála roghnaithe
+      invalid_csv_file: 'Comhad CSV neamhbhailí. Earráid: %{error}'
+      over_rows_processing_limit: níos mó ná %{count} sraitheanna
+      too_large: Tá an comhad ró-mhór
+    failures: Teipeanna
+    imported: Iompórtáilte
+    mismatched_types_warning: Is cosúil gur roghnaigh tú an cineál mícheart don iompórtáil seo, seiceáil arís le do thoil.
     modes:
       merge: Cumaisc
+      merge_long: Coinnigh taifid atá ann cheana féin agus cuir cinn nua leis
       overwrite: Forscríobh
+      overwrite_long: Cuir na cinn nua in ionad na dtaifead reatha
+    overwrite_preambles:
+      blocking_html: Tá tú ar tí <strong>do liosta bloc</strong> a chur in ionad suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      bookmarks_html: Tá tú ar tí <strong>do leabharmharcanna</strong> a chur in ionad suas le <strong>%{total_items} postáil</strong> ó <strong>%{filename}</strong>.
+      domain_blocking_html: Tá tú ar tí <strong>do liosta bloc fearainn</strong> a chur in ionad suas le <strong>%{total_items} fearainn</strong> ó <strong>%{filename}</strong>.
+      following_html: Tá tú ar tí <strong>leanúint</strong> suas go dtí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong> agus <strong>stop a leanúint aon duine eile</strong>.
+      lists_html: Tá tú ar tí <strong>do liostaí</strong> a chur in ionad inneachair <strong>%{filename}</strong>. Cuirfear suas le <strong>%{total_items} cuntas</strong> le liostaí nua.
+      muting_html: Tá tú ar tí <strong>do liosta cuntas balbhaithe</strong> a chur in ionad suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+    preambles:
+      blocking_html: Tá tú ar tí <strong>bloc</strong> suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      bookmarks_html: Tá tú ar tí <strong>%{total_items} postáil</strong> ó <strong>%{filename}</strong> a chur le do <strong>leabharmharcanna</strong>.
+      domain_blocking_html: Tá tú ar tí <strong>bloc</strong> suas le <strong>%{total_items} fearainn</strong> ó <strong>%{filename}</strong>.
+      following_html: Tá tú ar tí <strong>leanúint</strong> suas go dtí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+      lists_html: Tá tú ar tí <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong> a chur le do <strong>liostaí</strong>. Cruthófar liostaí nua mura bhfuil aon liosta le cur leis.
+      muting_html: Tá tú ar tí <strong>balbhú</strong> suas le <strong>%{total_items} cuntas</strong> ó <strong>%{filename}</strong>.
+    preface: Is féidir leat sonraí a d’easpórtáil tú a allmhairiú ó fhreastalaí eile, mar shampla liosta de na daoine a bhfuil tú ag leanúint nó ag cur bac orthu.
+    recent_imports: Allmhairí le déanaí
+    states:
+      finished: Críochnaithe
+      in_progress: Ar siúl
+      scheduled: Sceidealta
+      unconfirmed: Neamhdhearbhaithe
+    status: Stádas
+    success: Uaslódáladh do shonraí go rathúil agus próiseálfar iad in am trátha
+    time_started: Thosaigh ag
+    titles:
+      blocking: Cuntais bhlocáilte á n-iompórtáil
+      bookmarks: Leabharmharcanna á n-iompórtáil
+      domain_blocking: Fearainn blocáilte á n-iompórtáil
+      following: Cuntais leanta á n-iompórtáil
+      lists: Liostaí á n-iompórtáil
+      muting: Cuntais bhalbhaithe á n-iompórtáil
+    type: Cineál iompórtála
+    type_groups:
+      constructive: Seo a leanas & Leabharmharcanna
+      destructive: Bloic agus balbhaigh
     types:
+      blocking: Liosta blocála
       bookmarks: Leabharmharcanna
+      domain_blocking: Liosta blocála fearainn
+      following: Liosta ina dhiaidh sin
+      lists: Liostaí
+      muting: Liosta muting
     upload: Uaslódáil
   invites:
+    delete: Díghníomhachtaigh
     expired: As feidhm
     expires_in:
       '1800': 30 nóiméid
@@ -395,43 +1455,230 @@ ga:
       '604800': Seachtain amháin
       '86400': Lá amháin
     expires_in_prompt: In am ar bith
+    generate: Gin nasc cuireadh
+    invalid: Níl an cuireadh seo bailí
+    invited_by: 'Fuair ​​tú cuireadh ó:'
+    max_uses:
+      few: Úsáideann %{count}
+      many: Úsáideann %{count}
+      one: 1 úsáid
+      other: Úsáideann %{count}
+      two: Úsáideann %{count}
+    max_uses_prompt: Gan teorainn
+    prompt: Gin agus roinn naisc le daoine eile chun rochtain a dheonú ar an bhfreastalaí seo
+    table:
+      expires_at: In éag
+      uses: Úsáidí
+    title: Tabhair cuireadh do dhaoine
+  lists:
+    errors:
+      limit: Tá uaslíon na liostaí sroichte agat
   login_activities:
     authentication_methods:
+      otp: app fíordheimhnithe dhá-fachtóir
       password: pasfhocal
+      sign_in_token: cód slándála ríomhphoist
       webauthn: eochracha slándála
+    description_html: Má fheiceann tú gníomhaíocht nach n-aithníonn tú, smaoinigh ar do phasfhocal a athrú agus fíordheimhniú dhá fhachtóir a chumasú.
+    empty: Níl aon stair fíordheimhnithe ar fáil
+    failed_sign_in_html: Theip ar iarracht síniú isteach le %{method} ó %{ip} (%{browser})
+    successful_sign_in_html: D'éirigh le síniú isteach le %{method} ó %{ip} (%{browser})
+    title: Stair fíordheimhnithe
+  mail_subscriptions:
+    unsubscribe:
+      action: Sea, díliostáil
+      complete: Gan liostáil
+      confirmation_html: An bhfuil tú cinnte gur mhaith leat díliostáil ó %{type} a fháil do Mastodon ar %{domain} chuig do ríomhphost ag %{email}? Is féidir leat liostáil arís i gcónaí ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      emails:
+        notification_emails:
+          favourite: r-phoist fógra is fearr leat
+          follow: r-phoist fógra a leanúint
+          follow_request: r-phoist iarratais a leanúint
+          mention: trácht ar r-phoist fógra
+          reblog: r-phoist fógra a threisiú
+      resubscribe_html: Má dhíliostáil tú de dhearmad, is féidir leat liostáil arís ó do <a href="%{settings_path}">socruithe fógra ríomhphoist</a>.
+      success_html: Ní bhfaighidh tú %{type} le haghaidh Mastodon ar %{domain} chuig do ríomhphost ag %{email} a thuilleadh.
+      title: Díliostáil
+  media_attachments:
+    validations:
+      images_and_video: Ní féidir físeán a cheangal le postáil a bhfuil íomhánna ann cheana féin
+      not_ready: Ní féidir comhaid nach bhfuil próiseáil críochnaithe acu a cheangal. Bain triail eile as i gceann nóiméad!
+      too_many: Ní féidir níos mó ná 4 chomhad a cheangal
+  migrations:
+    acct: Bogtha go
+    cancel: Cealaigh atreorú
+    cancel_explanation: Má chuirtear an t-atreorú ar ceal, déanfar do chuntas reatha a athghníomhú, ach ní thabharfaidh sé seo leantóirí a aistríodh chuig an gcuntas sin ar ais.
+    cancelled_msg: D'éirigh leis an atreorú a chealú.
+    errors:
+      already_moved: an cuntas céanna ar bhog tú chuige cheana
+      missing_also_known_as: nach ailias den chuntas seo é
+      move_to_self: ní féidir é a bheith ina chuntas reatha
+      not_found: níorbh fhéidir a fháil
+      on_cooldown: Tá tú ar fuarú
+    followers_count: Leantóirí ag am aistrithe
+    incoming_migrations: Ag bogadh ó chuntas eile
+    incoming_migrations_html: Chun bogadh ó chuntas eile go dtí an ceann seo, ní mór duit <a href="%{path}">ailias cuntais a chruthú</a> ar dtús.
+    moved_msg: Tá do chuntas á atreorú chuig %{acct} anois agus tá do leantóirí á bhogadh anonn.
+    not_redirecting: Níl do chuntas á atreorú chuig aon chuntas eile faoi láthair.
+    on_cooldown: D'aistrigh tú do chuntas le déanaí. Beidh an fheidhm seo ar fáil arís i gceann %{count} lá.
+    past_migrations: Imirce san am a chuaigh thart
+    proceed_with_move: Bog leantóirí
+    redirected_msg: Tá do chuntas á atreorú chuig %{acct} anois.
+    redirecting_to: Tá do chuntas á atreorú chuig %{acct}.
+    set_redirect: Socraigh atreorú
+    warning:
+      backreference_required: Ní mór an cuntas nua a chumrú ar dtús chun cúltagairt a dhéanamh don cheann seo
+      before: 'Sula dtéann tú ar aghaidh, léigh na nótaí seo go cúramach le do thoil:'
+      cooldown: Tar éis bogadh tá tréimhse feithimh ann nach mbeidh tú in ann bogadh arís
+      disabled_account: Ní bheidh do chuntas reatha inúsáidte go hiomlán ina dhiaidh sin. Mar sin féin, beidh rochtain agat ar onnmhairiú sonraí chomh maith le hathghníomhú.
+      followers: Bogfaidh an gníomh seo gach leantóir ón gcuntas reatha go dtí an cuntas nua
+      only_redirect_html: Nó, ní féidir leat <a href="%{path}">ach atreorú a chur suas ar do phróifíl</a>.
+      other_data: Ní bhogfar aon sonraí eile go huathoibríoch
+      redirect: Déanfar próifíl do chuntais reatha a nuashonrú le fógra atreoraithe agus fágfar as an áireamh é ó chuardaigh
+  moderation:
+    title: Measarthacht
+  move_handler:
+    carry_blocks_over_text: Bhog an t-úsáideoir seo ó %{acct}, rud a chuir tú bac air.
+    carry_mutes_over_text: Bhog an t-úsáideoir seo ó %{acct}, rud a bhalbhaigh tú.
+    copy_account_note_text: 'Bhog an úsáideoir seo ó %{acct}, seo do nótaí roimhe seo fúthu:'
+  navigation:
+    toggle_menu: Scoránaigh roghchlár
   notification_mailer:
     admin:
       report:
         subject: Chuir %{name} tuairisc isteach
+      sign_up:
+        subject: Chláraigh %{name}
+    favourite:
+      body: 'B''fhearr le %{name} do phostáil:'
+      subject: B'fhearr le %{name} do phostáil
+      title: Nua is fearr leat
     follow:
       body: Tá %{name} do do leanúint anois!
       subject: Tá %{name} do do leanúint anois
       title: Leantóirí nua
+    follow_request:
+      action: Bainistigh iarratais leantacha
+      body: D'iarr %{name} tú a leanúint
+      subject: 'Leantóir ar feitheamh: %{name}'
+      title: Iarratas leantach nua
     mention:
       action: Freagair
+      body: 'Luaigh %{name} thú i:'
+      subject: Luaigh %{name} thú
+      title: Lua nua
+    poll:
+      subject: Tháinig deireadh le vótaíocht le %{name}
     reblog:
+      body: 'Treisíodh do phostáil le %{name}:'
       subject: Mhol %{name} do phostáil
       title: Moladh nua
+    status:
+      subject: Tá %{name} díreach postáilte
+    update:
+      subject: Chuir %{name} postáil in eagar
+  notifications:
+    administration_emails: Fógraí r-phoist admin
+    email_events: Imeachtaí le haghaidh fógraí ríomhphoist
+    email_events_hint: 'Roghnaigh imeachtaí ar mhaith leat fógraí a fháil ina leith:'
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
   otp_authentication:
+    code_hint: Cuir isteach an cód ginte ag d'aip fíordheimhnitheora le deimhniú
+    description_html: Má chumasaíonn tú <strong>fíordheimhniú dhá fhachtóir</strong> ag baint úsáide as aip fíordheimhneora, beidh ort do ghuthán a bheith i seilbh logáil isteach, rud a ghinfidh comharthaí chun tú a chur isteach.
     enable: Cumasaigh
+    instructions_html: "<strong>Scan an cód QR seo isteach i Google Authenticator nó aip eile TOTP ar do ghuthán</strong>. As seo amach, ginfidh an aip sin comharthaí a chaithfidh tú a chur isteach agus tú ag logáil isteach."
+    manual_instructions: 'Mura féidir leat an cód QR a scanadh agus más gá duit é a chur isteach de láimh, seo an rún gnáth-théacs:'
+    setup: Socraigh suas
+    wrong_code: Bhí an cód a iontráladh neamhbhailí! An bhfuil am freastalaí agus am gléis ceart?
   pagination:
     newer: Níos nuaí
     next: An céad eile
     older: Níos sine
     prev: Ceann roimhe seo
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Tá tú tar éis vótáil ar an vótaíocht seo cheana féin
+      duplicate_options: go bhfuil míreanna dúblacha
+      duration_too_long: rófhada amach anseo
+      duration_too_short: ró-luath
+      expired: Tá deireadh leis an vótaíocht cheana féin
+      invalid_choice: Níl an rogha vótála roghnaithe ann
+      over_character_limit: ní féidir leis a bheith níos faide ná %{max} carachtar an ceann
+      self_vote: Ní féidir leat vótáil i do phobalbhreith féin
+      too_few_options: caithfidh níos mó ná mír amháin a bheith ann
+      too_many_options: ní féidir níos mó ná %{max} mír a bheith ann
   preferences:
     other: Eile
+    posting_defaults: Réamhshocruithe á bpostáil
+    public_timelines: Amlínte poiblí
+  privacy:
+    hint_html: "<strong>Saincheap conas is mian leat do phróifíl agus do phostálacha a fháil.</strong> Is féidir le gnéithe éagsúla i Mastodon cabhrú leat teacht ar lucht féachana níos leithne nuair atá tú cumasaithe. Tóg nóiméad chun athbhreithniú a dhéanamh ar na socruithe seo chun a chinntiú go n-oireann siad do do chás úsáide."
+    privacy: Príobháideacht
+    privacy_hint_html: Rialú ar an méid is mian leat a nochtadh ar mhaithe le daoine eile. Aimsíonn daoine próifílí suimiúla agus aipeanna fionnuara trí na haipeanna seo a leanas a bhrabhsáil agus a fheiceáil cé na haipeanna a bpostálann siad, ach b’fhéidir gurbh fhearr leat é a choinneáil faoi cheilt.
+    reach: Shroich
+    reach_hint_html: Smacht a fháil ar cé acu is mian leat a fháil amach agus daoine nua a leanúint. Ar mhaith leat do phostálacha a thaispeáint ar an scáileán Explore? Ar mhaith leat go bhfeicfeadh daoine eile tú sna moltaí a leanann siad? Ar mhaith leat glacadh le gach leantóir nua go huathoibríoch, nó smacht gráinneach a bheith agat ar gach leantóir?
+    search: Cuardach
+    search_hint_html: Rialú conas ba mhaith leat a fháil. Ar mhaith leat go bhfaighidh daoine tú tríd an rud a chuir tú suas go poiblí faoi? Ar mhaith leat go bhfaighidh daoine lasmuigh de Mastodon do phróifíl agus iad ag cuardach an ghréasáin? Tabhair faoi deara le do thoil nach féidir eisiamh iomlán ó gach inneall cuardaigh a chinntiú mar fhaisnéis don phobal.
+    title: Príobháideacht agus teacht
+  privacy_policy:
+    title: Beartas Príobháideachais
+  reactions:
+    errors:
+      limit_reached: Teorainn frithghníomhartha éagsúla bainte amach
+      unrecognized_emoji: ní emoji aitheanta é
+  redirects:
+    prompt: Má tá muinín agat as an nasc seo, cliceáil air chun leanúint ar aghaidh.
+    title: Tá tú ag fágáil %{instance}.
   relationships:
+    activity: Gníomhaíocht chuntais
+    confirm_follow_selected_followers: An bhfuil tú cinnte gur mhaith leat na leantóirí roghnaithe a leanúint?
+    confirm_remove_selected_followers: An bhfuil tú cinnte gur mhaith leat na leantóirí roghnaithe a bhaint?
+    confirm_remove_selected_follows: An bhfuil tú cinnte gur mhaith leat na nithe seo a leanas roghnaithe a bhaint?
+    dormant: Díomhaoin
+    follow_failure: Níorbh fhéidir cuid de na cuntais roghnaithe a leanúint.
     follow_selected_followers: Lean leantóirí roghnaithe
     followers: Leantóirí
     following: Ag leanúint
+    invited: Cuireadh
+    last_active: Gníomhach seo caite
+    most_recent: Is déanaí
+    moved: Ar athraíodh a ionad
+    mutual: Frithpháirteach
     primary: Príomha
+    relationship: Gaol
+    remove_selected_domains: Remove all followers from the selected domains
     remove_selected_followers: Bain leantóirí roghnaithe
     remove_selected_follows: Dí-lean úsáideoirí roghnaithe
     status: Stádas cuntais
+  remote_follow:
+    missing_resource: Níorbh fhéidir an URL atreoraithe riachtanach do do chuntas a aimsiú
+  reports:
+    errors:
+      invalid_rules: ní thagraíonn sé do rialacha bailí
   rss:
     content_warning: 'Rabhadh ábhair:'
+    descriptions:
+      account: Postálacha poiblí ó @%{acct}
+      tag: 'Postálacha poiblí clibáilte # %{hashtag}'
+  scheduled_statuses:
+    over_daily_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat don lá atá inniu ann
+    over_total_limit: Tá an teorainn de %{limit} postáil sceidealaithe sáraithe agat
+    too_soon: Caithfidh an dáta sceidealta a bheith sa todhchaí
+  self_destruct:
+    lead_html: Ar an drochuair, tá <strong>%{domain}</strong> ag dúnadh síos go buan. Má bhí cuntas agat ann, ní bheidh tú in ann leanúint ar aghaidh á úsáid, ach is féidir leat cúltaca de do shonraí a iarraidh fós.
+    title: Tá an freastalaí seo ag dúnadh
   sessions:
+    activity: An ghníomhaíocht dheireanach
     browser: Brabhsálaí
     browsers:
       alipay: Alipay
@@ -441,41 +1688,162 @@ ga:
       electron: Electron
       firefox: Firefox
       generic: Brabhsálaí anaithnid
+      huawei_browser: Brabhsálaí Huawei
+      ie: Internet Explorer
+      micro_messenger: Micreascannán
+      nokia: Nokia s40 Ovi Brabhsálaí
+      opera: Opera
+      otter: Dobharchú
+      phantom_js: PhantomJS
+      qq: Brabhsálaí QQ
+      safari: Safari
+      uc_browser: Brabhsálaí UC
+      unknown_browser: Brabhsálaí Anaithnid
+      weibo: Weibo
+    current_session: Seisiún reatha
+    date: Dáta
+    description: "%{browser} ar %{platform}"
+    explanation: Seo iad na brabhsálaithe gréasáin atá logáilte isteach i do chuntas Mastodon faoi láthair.
+    ip: IP
     platforms:
+      adobe_air: Adobe Air
       android: Android
       blackberry: BlackBerry
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
+      kai_os: KaiOS
       linux: Linux
       mac: macOS
+      unknown_platform: Ardán Anaithnid
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Aisghair
+    revoke_success: Seisiún aisghairthe go rathúil
     title: Seisiúin
+    view_authentication_history: Féach ar stair fíordheimhnithe do chuntais
   settings:
     account: Cuntas
     account_settings: Socruithe cuntais
+    aliases: Ailiasanna cuntais
     appearance: Cuma
+    authorized_apps: Aipeanna údaraithe
     back: Ar ais go Mastodon
+    delete: Scriosadh cuntais
     development: Forbairt
     edit_profile: Cuir an phróifíl in eagar
+    export: Easpórtáil sonraí
+    featured_tags: Haischlib faoi thrácht
     import: Iompórtáil
+    import_and_export: Iompórtáil agus easpórtáil
+    migrate: Imirce cuntais
+    notifications: Fógraí ríomhphoist
     preferences: Sainroghanna pearsanta
     profile: Próifíl
+    relationships: Leantóirí agus leanúna
+    severed_relationships: Caidrimh dhearfa
+    statuses_cleanup: Uathscriosadh postála
+    strikes: Stailceanna measarthachta
+    two_factor_authentication: Údar dhá-fhachtóir
     webauthn_authentication: Eochracha slándála
+  severed_relationships:
+    download: Íoslódáil (%{count})
+    event_type:
+      account_suspension: Fionraí cuntais (%{target_name})
+      domain_block: Freastalaí ar fionraí (%{target_name})
+      user_domain_block: Chuir tú bac ar %{target_name}
+    lost_followers: Leanúna caillte
+    lost_follows: Seo a leanas caillte
+    preamble: Seans go gcaillfidh tú seo a leanas agus a leantóirí nuair a bhacálann tú fearann ​​nó nuair a shocraíonn do mhodhnóirí cianfhreastalaí a chur ar fionraí. Nuair a tharlaíonn sé sin, beidh tú in ann liostaí de chaidreamh deighilte a íoslódáil, lena n-iniúchadh agus b'fhéidir iompórtáil ar fhreastalaí eile.
+    purged: Glanadh faisnéis faoin bhfreastalaí seo ag riarthóirí do fhreastalaí.
+    type: Imeacht
   statuses:
+    attached:
+      audio:
+        few: "%{count} fuaime"
+        many: "%{count} fuaime"
+        one: "%{count} fuaime"
+        other: "%{count} fuaime"
+        two: "%{count} fuaime"
+      description: 'Ceangailte: %{attached}'
+      image:
+        few: "%{count} híomhánna"
+        many: "%{count} híomhánna"
+        one: "%{count} íomhá"
+        other: "%{count} híomhánna"
+        two: "%{count} híomhánna"
+      video:
+        few: "%{count} físeáin"
+        many: "%{count} físeáin"
+        one: "%{count} físeán"
+        other: "%{count} físeáin"
+        two: "%{count} físeáin"
     boosted_from_html: Molta ó %{acct_link}
     content_warning: 'Rabhadh ábhair: %{warning}'
+    default_language: Mar an gcéanna le teanga an chomhéadain
+    disallowed_hashtags:
+      few: 'bhí na Haischlib dícheadaithe: %{tags}'
+      many: 'bhí na Haischlib dícheadaithe: %{tags}'
+      one: 'bhí haischlib dícheadaithe: %{tags}'
+      other: 'bhí na Haischlib dícheadaithe: %{tags}'
+      two: 'bhí na Haischlib dícheadaithe: %{tags}'
+    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
       private: Leantóirí amháin
       private_long: Taispeáin do leantóirí amháin
+      public: Poiblí
+      public_long: Is féidir le gach duine a fheiceáil
+      unlisted: Neamhliostaithe
+      unlisted_long: Is féidir le gach duine a fheiceáil, ach nach bhfuil liostaithe ar amlínte poiblí
   statuses_cleanup:
+    enabled: Scrios seanphostálacha go huathoibríoch
+    enabled_hint: Scriostar do phostálacha go huathoibríoch nuair a shroicheann siad tairseach aoise sonraithe, ach amháin má thagann siad le ceann de na heisceachtaí thíos
+    exceptions: Eisceachtaí
+    explanation: Toisc gur oibríocht chostasach é postálacha a scriosadh, déantar é seo go mall le himeacht ama nuair nach mbíonn an freastalaí gnóthach ar bhealach eile. Ar an ábhar sin, d’fhéadfadh sé go scriosfar do phostálacha tamall tar éis dóibh an tairseach aoise a bhaint amach.
     ignore_favs: Tabhair neamhaird ar toghanna
+    ignore_reblogs: Déan neamhaird de boosts
+    interaction_exceptions: Eisceachtaí bunaithe ar idirghníomhaíochtaí
+    interaction_exceptions_explanation: Tabhair faoi deara nach bhfuil aon ráthaíocht go scriosfar postálacha má théann siad faoi bhun na tairsí is ansa leat nó an teanndáileog tar éis dóibh dul thar iad uair amháin.
+    keep_direct: Coinnigh teachtaireachtaí díreacha
+    keep_direct_hint: Ní scriosann sé aon cheann de do theachtaireachtaí díreacha
+    keep_media: Coinnigh postálacha le ceangaltáin meán
+    keep_media_hint: Ní scriosann sé aon cheann de do phostálacha a bhfuil ceangaltáin meán acu
+    keep_pinned: Coinnigh postálacha pinn
+    keep_pinned_hint: Ní scriosann sé aon cheann de do phostálacha pinn
+    keep_polls: Coinnigh pobalbhreith
+    keep_polls_hint: Ní scriosann sé aon cheann de do vótaíochtaí
+    keep_self_bookmark: Coinnigh postálacha leabharmharcáilte agat
+    keep_self_bookmark_hint: Ní scriosann sé do phostálacha féin má tá leabharmharcáilte agat
+    keep_self_fav: Coinnigh na poist a thaitin leat
+    keep_self_fav_hint: Ní scriosann sé do phostálacha féin más fearr leat iad
     min_age:
       '1209600': Coicís
       '15778476': 6 mhí
@@ -485,20 +1853,182 @@ ga:
       '604800': Seachtain amháin
       '63113904': 2 bhliain
       '7889238': 3 mhí
+    min_age_label: Tairseach aoise
+    min_favs: Coinnigh na poist is fearr leat ar a laghad
+    min_favs_hint: Ní scriosann sé aon cheann de do phostálacha a fuair ar a laghad an líon ceanán seo. Fág bán chun postálacha a scriosadh beag beann ar líon na gceanán atá acu
+    min_reblogs: Coinnigh postálacha treisithe ar a laghad
+    min_reblogs_hint: Ní scriosann sé aon cheann de do phostálacha a cuireadh leis an líon seo uaireanta ar a laghad. Fág bán chun postálacha a scriosadh beag beann ar a líon teanndáileog
   stream_entries:
     sensitive_content: Ábhar íogair
+  strikes:
+    errors:
+      too_late: Tá sé ró-dhéanach achomharc a dhéanamh faoin stailc seo
+  tags:
+    does_not_match_previous_name: nach meaitseálann an t-ainm roimhe seo
+  themes:
+    contrast: Mastodon (Codarsnacht ard)
+    default: Mastodon (Dorcha)
+    mastodon-light: Mastodon (Solas)
+    system: Uathoibríoch (úsáid téama córais)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
+  translation:
+    errors:
+      quota_exceeded: Sáraíodh an cuóta úsáide uile-fhreastalaí don tseirbhís aistriúcháin.
+      too_many_requests: Tá an iomarca iarratas ar an tseirbhís aistriúcháin le déanaí.
   two_factor_authentication:
+    add: Cuir
+    disable: Díchumasaigh 2FA
+    disabled_success: D'éirigh le fíordheimhniú dhá-fhachtóir a dhíchumasú
     edit: Cuir in eagar
+    enabled: Tá fíordheimhniú dhá fhachtóir cumasaithe
+    enabled_success: D'éirigh le fíordheimhniú dhá fhachtóir a chumasú
+    generate_recovery_codes: Gin cóid athshlánaithe
+    lost_recovery_codes: Ligeann cóid athshlánaithe duit rochtain a fháil ar do chuntas arís má chailleann tú do ghuthán. Má tá do chóid athshlánaithe caillte agat, is féidir leat iad a athnuachan anseo. Déanfar do sheanchóid athshlánaithe a neamhbhailíochtú.
+    methods: Modhanna dhá-fhachtóir
+    otp: Aip fíordheimhnitheora
+    recovery_codes: Cóid aisghabhála cúltaca
+    recovery_codes_regenerated: D'éirigh le hathghiniúint cóid athshlánaithe
+    recovery_instructions_html: Má chailleann tú rochtain ar do ghuthán riamh, is féidir leat ceann de na cóid athshlánaithe thíos a úsáid chun rochtain a fháil ar do chuntas arís. <strong>Coinnigh na cóid athshlánaithe slán</strong>. Mar shampla, is féidir leat iad a phriontáil agus iad a stóráil le doiciméid thábhachtacha eile.
     webauthn: Eochracha slándála
   user_mailer:
+    appeal_approved:
+      action: Socruithe cuntas
+      explanation: Ceadaíodh achomharc na stailce i gcoinne do chuntais ar %{strike_date} a chuir tú isteach ar %{appeal_date}. Tá seasamh maith ag do chuntas arís.
+      subject: Ceadaíodh d'achomharc ó %{date}
+      subtitle: Tá seasamh maith ag do chuntas arís.
+      title: Achomharc ceadaithe
+    appeal_rejected:
+      explanation: Diúltaíodh d'achomharc na stailce in aghaidh do chuntais ar %{strike_date} a chuir tú isteach ar %{appeal_date}.
+      subject: Diúltaíodh do d'achomharc ó %{date}
+      subtitle: Diúltaíodh do d'achomharc.
+      title: Diúltaíodh don achomharc
+    backup_ready:
+      explanation: D'iarr tú cúltaca iomlán de do chuntas Mastodon.
+      extra: Tá sé réidh le híoslódáil anois!
+      subject: Tá do chartlann réidh le híoslódáil
+      title: Tógáil cartlainne
+    failed_2fa:
+      details: 'Seo sonraí na hiarrachta síniú isteach:'
+      explanation: Rinne duine éigin iarracht síniú isteach ar do chuntas ach sholáthair sé fachtóir fíordheimhnithe dara neamhbhailí.
+      further_actions_html: Mura tusa a bhí ann, molaimid duit %{action} a dhéanamh láithreach toisc go bhféadfadh sé a bheith i gcontúirt.
+      subject: Teip fíordheimhnithe dara fachtóir
+      title: Theip ar fhíordheimhniú an dara fachtóir
+    suspicious_sign_in:
+      change_password: do phasfhocal a athrú
+      details: 'Seo sonraí faoin síniú isteach:'
+      explanation: Bhraitheamar síniú isteach ar do chuntas ó sheoladh IP nua.
+      further_actions_html: Mura tusa a bhí ann, molaimid duit %{action} a dhéanamh láithreach agus fíordheimhniú dhá fhachtóir a chumasú chun do chuntas a choinneáil slán.
+      subject: Fuarthas rochtain ar do chuntas ó sheoladh IP nua
+      title: Síniú isteach nua
     warning:
       appeal: Cuir achomharc isteach
+      appeal_description: Má chreideann tú gur earráid é seo, is féidir leat achomharc a chur isteach chuig foireann %{instance}.
       categories:
         spam: Turscar
+        violation: Sáraíonn ábhar na treoirlínte pobail seo a leanas
+      explanation:
+        delete_statuses: Fuarthas amach gur sháraigh roinnt de do chuid postálacha treoirlínte pobail amháin nó níos mó agus bhain modhnóirí %{instance} iad ina dhiaidh sin.
+        disable: Ní féidir leat do chuntas a úsáid a thuilleadh, ach fanann do phróifíl agus sonraí eile slán. Is féidir leat cúltaca de do shonraí a iarraidh, socruithe cuntais a athrú nó do chuntas a scriosadh.
+        mark_statuses_as_sensitive: Tá cuid de do chuid postálacha marcáilte mar íogair ag modhnóirí %{instance}. Ciallaíonn sé seo go mbeidh ar dhaoine na meáin a thapáil sna poist sula dtaispeánfar réamhamharc. Is féidir leat na meáin a mharcáil mar íogair tú féin agus tú ag postáil amach anseo.
+        sensitive: As seo amach, beidh gach do chomhaid meán uaslódáilte a mharcáil mar íogair agus i bhfolach taobh thiar de rabhadh cliceáil-trí.
+        silence: Is féidir leat do chuntas a úsáid go fóill ach ní fheicfidh ach na daoine atá ag leanúint ort cheana féin do phostálacha ar an bhfreastalaí seo, agus seans go mbeidh tú eisiata ó ghnéithe éagsúla fionnachtana. Féadfaidh daoine eile tú a leanúint de láimh, áfach.
+        suspend: Ní féidir leat do chuntas a úsáid a thuilleadh, agus níl rochtain ar do phróifíl ná ar shonraí eile a thuilleadh. Is féidir leat logáil isteach fós chun cúltaca de do shonraí a iarraidh go dtí go mbaintear na sonraí go hiomlán i gceann thart ar 30 lá, ach coinneoimid roinnt sonraí bunúsacha chun cosc ​​a chur ort an fionraí a sheachaint.
       reason: 'Fáth:'
+      statuses: 'Postálacha a luadh:'
       subject:
+        delete_statuses: Baineadh do phostálacha ar %{acct}
+        disable: Tá do chuntas %{acct} reoite
+        mark_statuses_as_sensitive: Marcáladh do phostálacha ar %{acct} mar íogair
         none: Rabhadh do %{acct}
+        sensitive: Marcálfar do phostálacha ar %{acct} mar íogair as seo amach
+        silence: Tá do chuntas %{acct} teoranta
+        suspend: Tá do chuntas %{acct} curtha ar fionraí
       title:
+        delete_statuses: Baineadh postálacha
+        disable: Cuntas reoite
+        mark_statuses_as_sensitive: Postálacha marcáilte mar íogair
         none: Rabhadh
+        sensitive: Cuntas marcáilte mar íogair
+        silence: Cuntas teoranta
+        suspend: Cuntas ar fionraí
+    welcome:
+      apps_android_action: Faigh é ar Google Play
+      apps_ios_action: Íoslódáil ar an App Store
+      apps_step: Íoslódáil ár n-aipanna oifigiúla.
+      apps_title: Aipeanna Mastodon
+      checklist_subtitle: 'Cuirimis tús leat ar an teorainn shóisialta nua seo:'
+      checklist_title: Seicliosta Fáilte
+      edit_profile_action: Pearsanú
+      edit_profile_step: Cuir le d'idirghníomhaíochtaí trí phróifíl chuimsitheach a bheith agat.
+      edit_profile_title: Déan do phróifíl a phearsantú
+      explanation: Seo roinnt leideanna chun tú a chur ar bun
+      feature_action: Foghlaim níos mó
+      feature_audience: Soláthraíonn Mastodon deis uathúil duit do lucht féachana a bhainistiú gan fir lár. Ligeann Mastodon a imlonnaítear ar do bhonneagar féin duit leanúint agus leanúint ó aon fhreastalaí Mastodon eile ar líne agus níl sé faoi smacht aon duine ach mise.
+      feature_audience_title: Tóg do lucht féachana faoi rún
+      feature_control: Is fearr a fhios agat cad ba mhaith leat a fheiceáil ar do bheathú baile. Gan algartam nó fógraí chun do chuid ama a chur amú. Lean aon duine ar fud aon fhreastalaí Mastodon ó chuntas amháin agus faigh a gcuid post in ord croineolaíoch, agus déan do chúinne den idirlíon beagán níos mó cosúil leatsa.
+      feature_control_title: Coinnigh smacht ar d’amlíne féin
+      feature_creativity: Tacaíonn Mastodon le postálacha fuaime, físe agus pictiúr, tuairiscí inrochtaineachta, pobalbhreitheanna, rabhaidh inneachair, avatars beoite, emojis saincheaptha, rialú barr mionsamhlacha, agus níos mó, chun cabhrú leat tú féin a chur in iúl ar líne. Cibé an bhfuil do chuid ealaíne, do cheol nó do phodchraoladh á fhoilsiú agat, tá Mastodon ann duit.
+      feature_creativity_title: Cruthaitheacht gan sárú
+      feature_moderation: Cuireann Mastodon cinnteoireacht ar ais i do lámha. Cruthaíonn gach freastalaí a rialacha agus a rialacháin féin, a chuirtear i bhfeidhm go háitiúil agus nach bhfuil ó bharr anuas cosúil le meáin shóisialta chorparáideacha, rud a fhágann gurb é an ceann is solúbtha é chun freagairt do riachtanais grúpaí éagsúla daoine. Bí ar fhreastalaí leis na rialacha a n-aontaíonn tú leo, nó do chuid féin a óstáil.
+      feature_moderation_title: Ag maolú ar an mbealach ar cheart dó a bheith
+      follow_action: Lean
+      follow_step: Is éard atá i gceist le daoine suimiúla a leanúint ná Mastodon.
+      follow_title: Cuir do chuid fotha baile in oiriúint duit féin
+      follows_subtitle: Lean cuntais aitheanta
+      follows_title: Cé a leanúint
+      follows_view_more: Féach ar níos mó daoine a leanúint
+      hashtags_recent_count:
+        few: "%{people} daoine le 2 lá anuas"
+        many: "%{people} daoine le 2 lá anuas"
+        one: "%{people} duine le 2 lá anuas"
+        other: "%{people} daoine le 2 lá anuas"
+        two: "%{people} daoine le 2 lá anuas"
+      hashtags_subtitle: Déan iniúchadh ar a bhfuil ag dul chun cinn le 2 lá anuas
+      hashtags_title: Haischlib treochta
+      hashtags_view_more: Féach ar níos mó Haischlib treochta
+      post_action: Cum
+      post_step: Abair hello leis an domhan le téacs, grianghraif, físeáin, nó pobalbhreith.
+      post_title: Déan do chéad phostáil
+      share_action: Comhroinn
+      share_step: Cuir in iúl do do chairde conas tú a aimsiú ar Mastodon.
+      share_title: Roinn do phróifíl Mastodon
+      sign_in_action: Sínigh isteach
+      subject: Fáilte go Mastodon
+      title: Fáilte ar bord, %{name}!
+  users:
+    follow_limit_reached: Ní féidir leat níos mó ná %{limit} duine a leanúint
+    go_to_sso_account_settings: Téigh chuig socruithe cuntais do sholáthraí aitheantais
+    invalid_otp_token: Cód dhá-fhachtóir neamhbhailí
+    otp_lost_help_html: Má chaill tú rochtain ar an dá cheann, is féidir leat dul i dteagmháil le %{email}
+    rate_limited: An iomarca iarrachtaí fíordheimhnithe, bain triail eile as ar ball.
+    seamless_external_login: Tá tú logáilte isteach trí sheirbhís sheachtrach, mar sin níl socruithe pasfhocail agus ríomhphoist ar fáil.
+    signed_in_as: 'Sínithe isteach mar:'
+  verification:
+    extra_instructions_html: <strong>Leid:</strong> Is féidir an nasc ar do shuíomh Gréasáin a bheith dofheicthe. Is í an chuid thábhachtach ná <code>rel="me"</code> a chuireann cosc ​​ar phearsanú ar shuímh Ghréasáin a bhfuil inneachar a ghintear leis an úsáideoir. Is féidir leat fiú clib <code>nasc</code> a úsáid i gceanntásc an leathanaigh in ionad <code>a</code>, ach caithfidh an HTML a bheith inrochtana gan JavaScript a chur i gcrích.
+    here_is_how: Seo é an chaoi
+    hint_html: "<strong>Is do chách é d'aitheantas a fhíorú ar Mastodon.</strong> Bunaithe ar chaighdeáin oscailte gréasáin, saor in aisce anois agus go deo. Níl uait ach láithreán gréasáin pearsanta a aithníonn daoine thú. Nuair a nascann tú leis an suíomh Gréasáin seo ó do phróifíl, seiceóimid go bhfuil nasc idir an suíomh Gréasáin agus do phróifíl agus taispeánfaimid táscaire amhairc air."
+    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
   webauthn_credentials:
+    add: Cuir eochair shlándála nua leis
+    create:
+      error: Bhí fadhb ann agus d'eochair shlándála á cur leis. Arís, le d'thoil.
+      success: Cuireadh d'eochair shlándála leis.
     delete: Scrios
+    delete_confirmation: An bhfuil tú cinnte gur mhaith leat an eochair shlándála seo a scriosadh?
+    description_html: Má chumasaíonn tú <strong>fíordheimhniú eochrach slándála</strong>, beidh ort ceann de na heochracha slándála a úsáid chun logáil isteach.
+    destroy:
+      error: Bhí fadhb ann agus d'eochair shlándála á scriosadh. Arís, le d'thoil.
+      success: Scriosadh d'eochair shlándála go rathúil.
+    invalid_credential: Eochair shlándála neamhbhailí
+    nickname_hint: Cuir isteach leasainm d'eochair shlándála nua
+    not_enabled: Níl WebAuthn cumasaithe agat fós
+    not_supported: This browser doesn't support security keys
+    otp_required: To use security keys please enable two-factor authentication first.
+    registered_on: Registered on %{date}
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c9f08dcad7..d1c8633bad 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -226,6 +226,7 @@ gl:
         update_custom_emoji: Actualizar emoticona personalizada
         update_domain_block: Actualizar bloqueo do dominio
         update_ip_block: Actualizar regra IP
+        update_report: Actualización da denuncia
         update_status: Actualizar publicación
         update_user_role: Actualizar Rol
       actions:
@@ -638,6 +639,7 @@ gl:
       report: 'Denuncia #%{id}'
       reported_account: Conta denunciada
       reported_by: Denunciado por
+      reported_with_application: Denunciado coa aplicación
       resolved: Resolto
       resolved_msg: Resolveuse con éxito a denuncia!
       skip_to_actions: Ir a accións
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index b67de192f2..0bfc30027a 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -32,6 +32,8 @@ hi:
       silence: सीमा
       silenced: सीमित
       title: खाते
+    reports:
+      reported_with_application: एप्लीकेशन से रिपोर्ट किया गया
     system_checks:
       upload_check_privacy_error:
         message_html: "<strong> आपके वेब सर्वर का कन्फिगरेशन सही नहीं है। उपयोगकर्ताओं की निजता खतरे में है। </strong>"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5def03d902..df32bd39d1 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -226,7 +226,7 @@ hu:
         update_custom_emoji: Egyéni emodzsi frissítése
         update_domain_block: Domain tiltás frissítése
         update_ip_block: IP-szabály frissítése
-        update_report: Bejelentés Frissítése
+        update_report: Bejelentés frissítése
         update_status: Bejegyzés frissítése
         update_user_role: Szerepkör frissítése
       actions:
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index f14a21b0c7..564f72e8c2 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -211,6 +211,7 @@ bg:
         setting_default_privacy: Поверителност на публикуване
         setting_default_sensitive: Все да се бележи мултимедията като деликатна
         setting_delete_modal: Показване на прозорче за потвърждение преди изтриване на публикация
+        setting_disable_hover_cards: Изключване на прегледа на профила, премествайки показалеца отгоре
         setting_disable_swiping: Деактивиране на бързо плъзгащи движения
         setting_display_media: Показване на мултимедия
         setting_display_media_default: Стандартно
@@ -242,11 +243,13 @@ bg:
           warn: Скриване зад предупреждение
       form_admin_settings:
         activity_api_enabled: Публикуване на агрегатна статистика относно потребителската дейност в API
+        app_icon: Икона на приложение
         backups_retention_period: Период за съхранение на потребителския архив
         bootstrap_timeline_accounts: Винаги да се препоръчват следните акаунти на нови потребители
         closed_registrations_message: Съобщение при неналична регистрация
         content_cache_retention_period: Период на запазване на отдалечено съдържание
         custom_css: Персонализиран CSS
+        favicon: Сайтоикона
         mascot: Плашило талисман по избор (остаряло)
         media_cache_retention_period: Период на запазване на мултимедийния кеш
         peers_api_enabled: Публикуване на списъка с открити сървъри в API
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index 3597544ce3..2effe1a10c 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -2,47 +2,239 @@
 ga:
   simple_form:
     hints:
+      account:
+        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.
+        indexable: Seans go mbeidh do phostálacha poiblí le feiceáil sna torthaí cuardaigh ar Mastodon. Seans go mbeidh daoine a d’idirghníomhaigh le do phostálacha in ann iad a chuardach beag beann ar.
+        note: 'Is féidir leat @trá a dhéanamh ar dhaoine eile nó #hashtags.'
+        show_collections: Beidh daoine in ann brabhsáil trí do seo a leanas agus do leanúna. Feicfidh na daoine a leanann tú go leanann tú iad beag beann ar.
+        unlocked: Beidh daoine in ann tú a leanúint gan cead a iarraidh. Díthiceáil an dteastaíonn uait athbhreithniú a dhéanamh ar iarratais leantacha agus roghnaigh cé acu an nglacfaidh nó an diúltóidh tú do leantóirí nua.
       account_alias:
         acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú uaidh
       account_migration:
         acct: Sonraigh ainm@fearann don chuntas ar mhaith leat aistriú chuige
+      account_warning_preset:
+        text: Is féidir leat comhréir na bpost a úsáid, mar URLanna, hashtags agus lua
+        title: Roghnach. Níl sé le feiceáil ag an bhfaighteoir
       admin_account_action:
+        include_statuses: Feicfidh an t-úsáideoir cé na poist ba chúis leis an ngníomh modhnóireachta nó leis an rabhadh
+        send_email_notification: Gheobhaidh an t-úsáideoir míniú ar an méid a tharla lena chuntas
+        text_html: Roghnach. Is féidir leat comhréir phoist a úsáid. Is féidir leat <a href="%{path}">réamhshocruithe rabhaidh a chur leis</a> chun am a shábháil
+        type_html: Roghnaigh cad atá le déanamh le <strong>%{acct}</strong>
         types:
           disable: Cuir cosc ar an úsáideoir a chuntas a úsáid, ach ná scrios ná folaigh a bhfuil ann.
+          none: Bain úsáid as seo chun rabhadh a sheoladh chuig an úsáideoir, gan aon ghníomh eile a spreagadh.
+          sensitive: Iallach a chur ar cheangaltáin meán an úsáideora seo go léir a bheith íogair.
+          silence: Cosc a chur ar an úsáideoir ó bheith in ann postáil le hinfheictheacht phoiblí, a gcuid postálacha agus fógraí a cheilt ar dhaoine nach leanann iad. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+          suspend: Cosc ar aon idirghníomhaíocht ón gcuntas seo nó chuig an gcuntas seo agus scrios a bhfuil ann. Inchúlaithe laistigh de 30 lá. Dúnann sé gach tuairisc i gcoinne an chuntais seo.
+        warning_preset_id: Roghnach. Is féidir leat téacs saincheaptha a chur le deireadh an réamhshocraithe fós
+      announcement:
+        all_day: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach dátaí an raon ama
+        ends_at: Roghnach. Beidh an fógra neamhfhoilsithe go huathoibríoch ag an am seo
+        scheduled_at: Fág bán chun an fógra a fhoilsiú láithreach
+        starts_at: Roghnach. I gcás go bhfuil d'fhógra ceangailte le raon ama ar leith
+        text: Is féidir leat comhréir phoist a úsáid. Tabhair aird ar an spás a ghlacfaidh an fógra ar scáileán an úsáideora
+      appeal:
+        text: Ní féidir leat achomharc a dhéanamh ach uair amháin ar stailc
       defaults:
+        autofollow: Leanfaidh daoine a chláraíonn tríd an gcuireadh thú go huathoibríoch
+        avatar: WEBP, PNG, GIF nó JPG. %{size} ar a mhéad. Íoslaghdófar é go %{dimensions}px
+        bot: Cuir in iúl do dhaoine eile go ndéanann an cuntas gníomhartha uathoibrithe den chuid is mó agus go mb’fhéidir nach ndéanfar monatóireacht air
+        context: Comhthéacs amháin nó comhthéacsanna iolracha inar cheart go mbeadh feidhm ag an scagaire
+        current_password: Chun críocha slándála cuir isteach pasfhocal an chuntais reatha
+        current_username: Le deimhniú, cuir isteach ainm úsáideora an chuntais reatha
+        digest: Seoltar é tar éis tréimhse fhada neamhghníomhaíochta amháin agus sa chás sin amháin go bhfuil aon teachtaireachtaí pearsanta faighte agat agus tú as láthair
+        email: Seolfar ríomhphost deimhnithe chugat
+        header: WEBP, PNG, GIF nó JPG. %{size} ar a mhéad. Íoslaghdófar é go %{dimensions}px
+        inbox_url: Cóipeáil an URL ó leathanach tosaigh an athsheachadáin is mian leat a úsáid
+        irreversible: Imeoidh postálacha scagtha go dochúlaithe, fiú má bhaintear an scagaire níos déanaí
+        locale: Teanga an chomhéadain úsáideora, r-phoist agus fógraí brú
+        password: Úsáid ar a laghad 8 gcarachtar
+        phrase: Déanfar é a mheaitseáil beag beann ar chásáil an téacs nó ar an ábhar atá ag tabhairt foláireamh do phostáil
+        scopes: Cé na APIanna a mbeidh cead ag an bhfeidhmchlár rochtain a fháil orthu. Má roghnaíonn tú raon feidhme barrleibhéil, ní gá duit cinn aonair a roghnú.
+        setting_aggregate_reblogs: Ná taispeáin treisithe nua do phoist a treisíodh le déanaí (ní dhéanann difear ach do threisithe nuafhaighte)
+        setting_always_send_emails: Go hiondúil ní sheolfar fógraí ríomhphoist agus tú ag úsáid Mastodon go gníomhach
+        setting_default_sensitive: Tá meáin íogair i bhfolach de réir réamhshocraithe agus is féidir iad a nochtadh le cliceáil
+        setting_display_media_default: Folaigh meáin atá marcáilte mar íogair
         setting_display_media_hide_all: Folaigh meáin i gcónaí
         setting_display_media_show_all: Taispeáin meáin i gcónaí
+        setting_use_blurhash: Tá grádáin bunaithe ar dhathanna na n-amharcanna ceilte ach cuireann siad salach ar aon mhionsonraí
+        setting_use_pending_items: Folaigh nuashonruithe amlíne taobh thiar de chlic seachas an fotha a scrollú go huathoibríoch
+        username: Is féidir leat litreacha, uimhreacha, agus béim a úsáid
+        whole_word: Nuair a bhíonn an eochairfhocal nó frása alfa-uimhriúil amháin, ní chuirfear i bhfeidhm é ach amháin má mheaitseálann sé an focal iomlán
+      domain_allow:
+        domain: Beidh an fearann ​​seo in ann sonraí a fháil ón bhfreastalaí seo agus déanfar sonraí a thagann isteach uaidh a phróiseáil agus a stóráil
+      email_domain_block:
+        domain: Is féidir gurb é seo an t-ainm fearainn a thaispeánann sa seoladh ríomhphoist nó sa taifead MX a úsáideann sé. Déanfar iad a sheiceáil nuair a chláraítear iad.
+        with_dns_records: Déanfar iarracht taifid DNS an fhearainn tugtha a réiteach agus cuirfear bac ar na torthaí freisin
+      featured_tag:
+        name: 'Seo cuid de na hashtags a d’úsáid tú le déanaí:'
+      filters:
+        action: Roghnaigh an gníomh ba cheart a dhéanamh nuair a mheaitseálann postáil an scagaire
+        actions:
+          hide: Cuir an t-ábhar scagtha i bhfolach go hiomlán, ag iompar amhail is nach raibh sé ann
+          warn: Folaigh an t-ábhar scagtha taobh thiar de rabhadh a luann teideal an scagaire
+      form_admin_settings:
+        activity_api_enabled: Áireamh na bpost a foilsíodh go háitiúil, úsáideoirí gníomhacha, agus clárúcháin nua i buicéid seachtainiúla
+        app_icon: WEBP, PNG, GIF nó JPG. Sáraíonn sé an deilbhín réamhshocraithe aipe ar ghléasanna soghluaiste le deilbhín saincheaptha.
+        backups_retention_period: Tá an cumas ag úsáideoirí cartlanna dá gcuid post a ghiniúint le híoslódáil níos déanaí. Nuair a bheidh luach dearfach socraithe, scriosfar na cartlanna seo go huathoibríoch ó do stór tar éis an líon sonraithe laethanta.
+        bootstrap_timeline_accounts: Cuirfear na cuntais seo ar bharr na moltaí a leanann úsáideoirí nua.
+        closed_registrations_message: Ar taispeáint nuair a dhúntar clárúcháin
+        content_cache_retention_period: Scriosfar gach postáil ó fhreastalaithe eile (lena n-áirítear treisithe agus freagraí) tar éis an líon sonraithe laethanta, gan aird ar aon idirghníomhaíocht úsáideora áitiúil leis na postálacha sin. Áirítear leis seo postálacha ina bhfuil úsáideoir áitiúil tar éis é a mharcáil mar leabharmharcanna nó mar cheanáin. Caillfear tagairtí príobháideacha idir úsáideoirí ó chásanna éagsúla freisin agus ní féidir iad a athchóiriú. Tá úsáid an tsocraithe seo beartaithe le haghaidh cásanna sainchuspóra agus sáraítear go leor ionchais úsáideoirí nuair a chuirtear i bhfeidhm é le haghaidh úsáid ghinearálta.
+        custom_css: Is féidir leat stíleanna saincheaptha a chur i bhfeidhm ar an leagan gréasáin de Mastodon.
+        favicon: WEBP, PNG, GIF nó JPG. Sáraíonn sé an favicon Mastodon réamhshocraithe le deilbhín saincheaptha.
+        mascot: Sáraíonn sé an léaráid san ardchomhéadan gréasáin.
+        media_cache_retention_period: Déantar comhaid meán ó phoist a dhéanann cianúsáideoirí a thaisceadh ar do fhreastalaí. Nuair a bheidh luach dearfach socraithe, scriosfar na meáin tar éis an líon sonraithe laethanta. Má iarrtar na sonraí meán tar éis é a scriosadh, déanfar é a ath-íoslódáil, má tá an t-ábhar foinse fós ar fáil. Mar gheall ar shrianta ar cé chomh minic is atá cártaí réamhamhairc ag vótaíocht do shuíomhanna tríú páirtí, moltar an luach seo a shocrú go 14 lá ar a laghad, nó ní dhéanfar cártaí réamhamhairc naisc a nuashonrú ar éileamh roimh an am sin.
+        peers_api_enabled: Liosta de na hainmneacha fearainn ar tháinig an freastalaí seo orthu sa choinbhleacht. Níl aon sonraí san áireamh anseo faoi cé acu an ndéanann tú cónascadh le freastalaí ar leith, díreach go bhfuil a fhios ag do fhreastalaí faoi. Úsáideann seirbhísí a bhailíonn staitisticí ar chónaidhm go ginearálta é seo.
+        profile_directory: Liostaíonn an t-eolaire próifíle na húsáideoirí go léir a roghnaigh isteach le bheith in-aimsithe.
+        require_invite_text: Nuair a bhíonn faomhadh láimhe ag teastáil le haghaidh clárúcháin, déan an "Cén fáth ar mhaith leat a bheith páirteach?" ionchur téacs éigeantach seachas roghnach
+        site_contact_email: Conas is féidir le daoine dul i dteagmháil leat le haghaidh fiosrúchán dlíthiúil nó tacaíochta.
+        site_contact_username: Conas is féidir le daoine dul i dteagmháil leat ar Mastodon.
+        site_extended_description: Aon fhaisnéis bhreise a d’fhéadfadh a bheith úsáideach do chuairteoirí agus d’úsáideoirí. Is féidir é a struchtúrú le comhréir Markdown.
+        site_short_description: Cur síos gairid chun cabhrú le do fhreastalaí a aithint go uathúil. Cé atá á rith, cé dó a bhfuil sé?
+        site_terms: Bain úsáid as do pholasaí príobháideachta féin nó fág bán é chun an réamhshocrú a úsáid. Is féidir é a struchtúrú le comhréir Markdown.
+        site_title: Conas is féidir le daoine tagairt a dhéanamh do do fhreastalaí seachas a ainm fearainn.
+        status_page_url: URL leathanach inar féidir le daoine stádas an fhreastalaí seo a fheiceáil le linn briseadh amach
+        theme: Téama a fheiceann cuairteoirí logáilte amach agus úsáideoirí nua.
+        thumbnail: Íomhá thart ar 2:1 ar taispeáint taobh le faisnéis do fhreastalaí.
+        timeline_preview: Beidh cuairteoirí logáilte amach in ann na postálacha poiblí is déanaí atá ar fáil ar an bhfreastalaí a bhrabhsáil.
+        trendable_by_default: Léim ar athbhreithniú láimhe ar ábhar treochta. Is féidir míreanna aonair a bhaint as treochtaí fós tar éis an fhíric.
+        trends: Léiríonn treochtaí cé na postálacha, hashtags agus scéalta nuachta atá ag tarraingt ar do fhreastalaí.
+        trends_as_landing_page: Taispeáin inneachar treochta d'úsáideoirí agus do chuairteoirí atá logáilte amach in ionad cur síos ar an bhfreastalaí seo. Éilíonn treochtaí a chumasú.
+      form_challenge:
+        current_password: Tá tú ag dul isteach i limistéar slán
+      imports:
+        data: Comhad CSV easpórtáilte ó fhreastalaí Mastodon eile
+      invite_request:
+        text: Cabhróidh sé seo linn d’iarratas a athbhreithniú
+      ip_block:
+        comment: Roghnach. Cuimhnigh cén fáth ar chuir tú an riail seo leis.
+        expires_in: Is acmhainn chríochta iad seoltaí IP, uaireanta roinntear iad agus is minic a athraíonn lámha. Ar an gcúis seo, ní mholtar bloic IP éiginnte.
+        ip: Cuir isteach seoladh IPv4 nó IPv6. Is féidir leat raonta iomlána a bhlocáil ag baint úsáide as an chomhréir CIDR. Bí cúramach gan tú féin a ghlasáil amach!
+        severities:
+          no_access: Cuir bac ar rochtain ar na hacmhainní go léir
+          sign_up_block: Ní bheidh clárú nua indéanta
+          sign_up_requires_approval: Beidh do cheadú ag teastáil le haghaidh clárúcháin nua
+        severity: Roghnaigh cad a tharlóidh le hiarratais ón IP seo
+      rule:
+        hint: Roghnach. Tabhair tuilleadh sonraí faoin riail
+        text: Déan cur síos ar riail nó riachtanas d'úsáideoirí ar an bhfreastalaí seo. Déan iarracht é a choinneáil gearr agus simplí
+      sessions:
+        otp: 'Cuir isteach an cód dhá fhachtóir ginte ag d''aip ghutháin nó úsáid ceann de do chóid athshlánaithe:'
+        webauthn: Más eochair USB atá ann déan cinnte é a chur isteach agus, más gá, tapáil í.
+      settings:
+        indexable: Seans go mbeidh do leathanach próifíle le feiceáil i dtorthaí cuardaigh ar Google, Bing agus eile.
+        show_application: Beidh tú in ann a fheiceáil i gcónaí cén aip a d’fhoilsigh do phostáil beag beann ar.
+      tag:
+        name: Ní féidir leat ach cásáil na litreacha a athrú, mar shampla, chun é a dhéanamh níos inléite
+      user:
+        chosen_languages: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach postálacha i dteangacha roghnaithe in amlínte poiblí
+        role: Rialaíonn an ról na ceadanna atá ag an úsáideoir
+      user_role:
+        color: Dath le húsáid don ról ar fud an Chomhéadain, mar RGB i bhformáid heicsidheachúlach
+        highlighted: Déanann sé seo an ról le feiceáil go poiblí
+        name: Ainm poiblí an róil, má tá an ról socraithe le taispeáint mar shuaitheantas
+        permissions_as_keys: Beidh rochtain ag úsáideoirí a bhfuil an ról seo acu ar...
+        position: Cinneann ról níos airde réiteach coinbhleachta i gcásanna áirithe. Ní féidir gníomhartha áirithe a dhéanamh ach amháin ar róil a bhfuil tosaíocht níos ísle acu
+      webhook:
+        events: Roghnaigh imeachtaí le seoladh
+        template: Cum do phálasta JSON féin ag baint úsáide as idirshuíomh athróg. Fág bán le haghaidh JSON réamhshocraithe.
+        url: An áit a seolfar imeachtaí chuig
     labels:
       account:
+        discoverable: Próifíl gné agus postálacha in halgartaim fionnachtana
         fields:
           name: Lipéad
+          value: Ábhar
+        indexable: Cuir postálacha poiblí san áireamh sna torthaí cuardaigh
+        show_collections: Taispeáin seo a leanas agus leanúna ar phróifíl
+        unlocked: Glac le leantóirí nua go huathoibríoch
+      account_alias:
+        acct: Láimhseáil an seanchuntais
+      account_migration:
+        acct: Láimhseáil an chuntais nua
       account_warning_preset:
+        text: Téacs réamhshocraithe
         title: Teideal
       admin_account_action:
+        include_statuses: Cuir postálacha tuairiscithe san áireamh sa ríomhphost
+        send_email_notification: Cuir an t-úsáideoir ar an eolas trí ríomhphost
         text: Rabhadh saincheaptha
+        type: Gníomh
         types:
           disable: Reoigh
           none: Seol rabhadh
+          sensitive: Íogair
           silence: Teorannaigh
           suspend: Cuir ar fionraí
+        warning_preset_id: Bain úsáid as réamhshocrú rabhaidh
       announcement:
+        all_day: Imeacht uile-lae
+        ends_at: Deireadh an imeachta
+        scheduled_at: Foilsiú sceideal
+        starts_at: Tús na hócáide
         text: Fógra
+      appeal:
+        text: Mínigh cén fáth ar cheart an cinneadh seo a fhreaschur
       defaults:
+        autofollow: Tabhair cuireadh do chuntas a leanúint
         avatar: Abhatár
+        bot: Is cuntas uathoibrithe é seo
+        chosen_languages: Scag teangacha
+        confirm_new_password: Deimhnigh pasfhocal nua
+        confirm_password: Deimhnigh Pasfhocal
+        context: Comhthéacsanna a scagadh
+        current_password: Pasfhocal reatha
         data: Sonraí
         display_name: Ainm taispeána
         email: Seoladh ríomhphoist
+        expires_in: In éag tar éis
+        fields: Réimsí breise
         header: Ceanntásc
+        honeypot: "%{label} (ná líon isteach)"
+        inbox_url: URL an bhosca isteach sealaíochta
+        irreversible: Droim ar aghaidh in ionad bheith ag folaigh
+        locale: Teanga comhéadan
+        max_uses: Uaslíon úsáidí
         new_password: Pasfhocal nua
         note: Beathaisnéis
+        otp_attempt: Cód dhá-fhachtóir
         password: Pasfhocal
+        phrase: Eochairfhocal nó frása
+        setting_advanced_layout: Cumasaigh ardchomhéadan gréasáin
+        setting_aggregate_reblogs: Treisithe grúpa i línte ama
+        setting_always_send_emails: Seol fógraí ríomhphoist i gcónaí
+        setting_auto_play_gif: Gifs beoite go huathoibríoch a imirt
+        setting_boost_modal: Taispeáin dialóg deimhnithe roimh threisiú
+        setting_default_language: Teanga postála
+        setting_default_privacy: Postáil príobháideachta
+        setting_default_sensitive: Marcáil na meáin mar íogair i gcónaí
+        setting_delete_modal: Taispeáin dialóg deimhnithe sula scriostar postáil
+        setting_disable_hover_cards: Díchumasaigh réamhamharc próifíle ar ainlíon
+        setting_disable_swiping: Díchumasaigh gluaiseachtaí swiping
+        setting_display_media: Taispeáint meáin
         setting_display_media_default: Réamhshocrú
         setting_display_media_hide_all: Cuir uile i bhfolach
         setting_display_media_show_all: Taispeáin uile
+        setting_expand_spoilers: Méadaigh postálacha atá marcáilte le rabhaidh inneachair i gcónaí
+        setting_hide_network: Folaigh do ghraf sóisialta
+        setting_reduce_motion: Laghdú ar an tairiscint i beochan
+        setting_system_font_ui: Úsáid cló réamhshocraithe an chórais
         setting_theme: Téama suímh
         setting_trends: Taispeáin treochtaí an lae inniu
+        setting_unfollow_modal: Taispeáin dialóg deimhnithe sula ndíleanfaidh tú duine éigin
+        setting_use_blurhash: Taispeáin grádáin ildaite do mheáin fholaithe
+        setting_use_pending_items: Modh mall
+        severity: Déine
+        sign_in_token_attempt: Cód slándála
         title: Teideal
+        type: Cineál iompórtála
         username: Ainm úsáideora
+        username_or_email: Ainm Úsáideora nó Ríomhphost
+        whole_word: Focal ar fad
+      email_domain_block:
+        with_dns_records: Cuir taifid MX agus IPanna an fhearainn san áireamh
       featured_tag:
         name: Haischlib
       filters:
@@ -50,27 +242,100 @@ ga:
           hide: Cuir i bhfolach go hiomlán
           warn: Cuir i bhfolach le rabhadh
       form_admin_settings:
+        activity_api_enabled: Foilsigh staitisticí comhiomlána faoi ghníomhaíocht úsáideoirí san API
+        app_icon: Deilbhín aip
+        backups_retention_period: Tréimhse choinneála cartlainne úsáideora
+        bootstrap_timeline_accounts: Mol na cuntais seo d'úsáideoirí nua i gcónaí
+        closed_registrations_message: Teachtaireacht saincheaptha nuair nach bhfuil sínithe suas ar fáil
+        content_cache_retention_period: Tréimhse choinneála inneachair cianda
+        custom_css: CSS saincheaptha
+        favicon: Favicon
+        mascot: Mascóg saincheaptha (oidhreacht)
+        media_cache_retention_period: Tréimhse choinneála taisce meán
+        peers_api_enabled: Foilsigh liosta de na freastalaithe aimsithe san API
+        profile_directory: Cumasaigh eolaire próifíle
+        registrations_mode: Cé atá in ann clárú
+        require_invite_text: A cheangal ar chúis a bheith páirteach
+        show_domain_blocks: Taispeáin bloic fearainn
+        show_domain_blocks_rationale: Taispeáin cén fáth ar cuireadh bac ar fhearann
+        site_contact_email: R-phost teagmhála
+        site_contact_username: Ainm úsáideora teagmhála
         site_extended_description: Cur síos fada
         site_short_description: Cur síos freastalaí
         site_terms: Polasaí príobháideachais
         site_title: Ainm freastalaí
+        status_page_url: URL an leathanaigh stádais
+        theme: Téama réamhshocraithe
+        thumbnail: Mionsamhail freastalaí
+        timeline_preview: Ceadaigh rochtain neamhdheimhnithe ar amlínte poiblí
+        trendable_by_default: Ceadaigh treochtaí gan athbhreithniú roimh ré
+        trends: Cumasaigh treochtaí
+        trends_as_landing_page: Úsáid treochtaí mar an leathanach tuirlingthe
+      interactions:
+        must_be_follower: Cuir bac ar fhógraí ó dhaoine nach leantóirí iad
+        must_be_following: Cuir bac ar fhógraí ó dhaoine nach leanann tú
+        must_be_following_dm: Cuir bac ar theachtaireachtaí díreacha ó dhaoine nach leanann tú
       invite:
         comment: Ráiteas
+      invite_request:
+        text: Cén fáth ar mhaith leat a bheith páirteach?
       ip_block:
         comment: Ráiteas
         ip: IP
+        severities:
+          no_access: Rochtain a bhlocáil
+          sign_up_block: Cuir bac ar chlárúcháin
+          sign_up_requires_approval: Teorainn le clárú
         severity: Riail
       notification_emails:
+        appeal: Déanann duine éigin achomharc i gcoinne chinneadh modhnóra
+        digest: Seol r-phoist achoimre
+        favourite: Is fearr le duine éigin do phostáil
         follow: Lean duine éigin tú
+        follow_request: D'iarr duine éigin tú a leanúint
+        mention: Luaigh duine éigin tú
+        pending_account: Ní mór athbhreithniú a dhéanamh ar chuntas nua
         reblog: Mhol duine éigin do phostáil
+        report: Tá tuairisc nua curtha isteach
+        software_updates:
+          all: Fógra a thabhairt ar gach nuashonrú
+          critical: Fógra a thabhairt ar nuashonruithe ríthábhachtacha amháin
+          label: Tá leagan nua Mastodon ar fáil
+          none: Ná cuir nuashonruithe ar an eolas choíche (ní mholtar é)
+          patch: Fógra ar nuashonruithe bugfix
+        trending_tag: Teastaíonn athbhreithniú ar threocht nua
       rule:
+        hint: Eolas breise
         text: Riail
+      settings:
+        indexable: Cuir leathanach próifíle san innill chuardaigh
+        show_application: Taispeáin cén aip ónar sheol tú postáil
       tag:
+        listable: Lig don hashchlib seo a bheith le feiceáil i gcuardach agus i moltaí
         name: Haischlib
+        trendable: Lig don haischlib seo a bheith le feiceáil faoi threochtaí
+        usable: Lig do phostálacha an hashchlib seo a úsáid
       user:
         role: Ról
+        time_zone: Crios ama
       user_role:
+        color: Dath suaitheantas
+        highlighted: Taispeáin ról mar shuaitheantas ar phróifílí úsáideora
         name: Ainm
+        permissions_as_keys: Ceadanna
+        position: Tosaíocht
+      webhook:
+        events: Imeachtaí cumasaithe
+        template: Teimpléad pá-ualach
+        url: URL críochphointe
+    'no': Níl
+    not_recommended: Ní mholtar
+    overridden: Sáraithe
     recommended: Molta
     required:
       mark: "*"
+      text: ag teastáil
+    title:
+      sessions:
+        webauthn: Úsáid ceann de d'eochracha slándála chun síniú isteach
+    'yes': Tá
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 344368a08a..f63aadd6c8 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -663,6 +663,7 @@ sl:
       report: 'Prijavi #%{id}'
       reported_account: Prijavljeni račun
       reported_by: Prijavil/a
+      reported_with_application: Prijavljeno s programom
       resolved: Razrešeni
       resolved_msg: Prijava je uspešno razrešena!
       skip_to_actions: Preskoči na dejanja
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 6b28e17441..9855b56924 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -639,6 +639,7 @@ tr:
       report: 'Şikayet #%{id}'
       reported_account: Şikayet edilen hesap
       reported_by: Şikayet eden
+      reported_with_application: Uygulamayla bildirildi
       resolved: Giderildi
       resolved_msg: Şikayet başarıyla çözümlendi!
       skip_to_actions: İşlemlere atla

From f587ff643f552a32a1c43e103a474a5065cd3657 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 18 Jul 2024 16:36:09 +0200
Subject: [PATCH 06/11] Grouped Notifications UI (#30440)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---
 .../api/v2_alpha/notifications_controller.rb  |  53 +-
 app/javascript/mastodon/actions/markers.ts    |  14 +-
 .../mastodon/actions/notification_groups.ts   | 144 +++++
 .../mastodon/actions/notifications.js         |  13 +-
 .../actions/notifications_migration.tsx       |  18 +
 .../mastodon/actions/notifications_typed.ts   |   9 +-
 app/javascript/mastodon/actions/streaming.js  |  11 +-
 app/javascript/mastodon/api/notifications.ts  |  18 +
 .../mastodon/api_types/notifications.ts       | 145 +++++
 app/javascript/mastodon/api_types/reports.ts  |  16 +
 .../mastodon/components/load_gap.tsx          |  12 +-
 app/javascript/mastodon/components/status.jsx |   8 +-
 .../mastodon/components/status_list.jsx       |   2 +-
 .../compose/components/edit_indicator.jsx     |  10 +-
 .../compose/components/reply_indicator.jsx    |  10 +-
 .../components/column_settings.jsx            |  11 +
 .../filtered_notifications_banner.tsx         |   4 +-
 .../components/moderation_warning.tsx         |  51 +-
 .../notifications/components/notification.jsx |   4 +-
 .../relationships_severance_event.jsx         |  15 +-
 .../containers/column_settings_container.js   |   8 +-
 .../mastodon/features/notifications/index.jsx |   2 +-
 .../components/avatar_group.tsx               |  31 ++
 .../components/embedded_status.tsx            |  93 ++++
 .../components/embedded_status_content.tsx    | 165 ++++++
 .../components/names_list.tsx                 |  51 ++
 .../components/notification_admin_report.tsx  | 132 +++++
 .../components/notification_admin_sign_up.tsx |  31 ++
 .../components/notification_favourite.tsx     |  45 ++
 .../components/notification_follow.tsx        |  31 ++
 .../notification_follow_request.tsx           |  78 +++
 .../components/notification_group.tsx         | 134 +++++
 .../notification_group_with_status.tsx        |  91 ++++
 .../components/notification_mention.tsx       |  55 ++
 .../notification_moderation_warning.tsx       |  13 +
 .../components/notification_poll.tsx          |  41 ++
 .../components/notification_reblog.tsx        |  45 ++
 .../notification_severed_relationships.tsx    |  15 +
 .../components/notification_status.tsx        |  31 ++
 .../components/notification_update.tsx        |  31 ++
 .../components/notification_with_status.tsx   |  73 +++
 .../features/notifications_v2/filter_bar.tsx  | 145 +++++
 .../features/notifications_v2/index.tsx       | 354 ++++++++++++
 .../features/notifications_wrapper.jsx        |  13 +
 .../features/ui/components/columns_area.jsx   |   4 +-
 .../ui/components/navigation_panel.jsx        |   9 +-
 app/javascript/mastodon/features/ui/index.jsx |   9 +-
 .../features/ui/util/async-components.js      |  10 +-
 app/javascript/mastodon/locales/en.json       |  15 +-
 .../mastodon/models/notification_group.ts     | 207 +++++++
 app/javascript/mastodon/reducers/index.ts     |   2 +
 app/javascript/mastodon/reducers/markers.ts   |  22 +-
 .../mastodon/reducers/notification_groups.ts  | 508 ++++++++++++++++++
 .../mastodon/reducers/notifications.js        |   4 +-
 .../mastodon/selectors/notifications.ts       |  34 ++
 app/javascript/mastodon/selectors/settings.ts |  40 ++
 .../styles/mastodon/components.scss           | 293 +++++++++-
 app/models/notification.rb                    |   1 +
 app/models/notification_group.rb              |   8 +-
 .../rest/notification_group_serializer.rb     |   1 +
 .../rest/notification_serializer.rb           |   1 +
 app/services/notify_service.rb                |   4 +-
 config/routes.rb                              |   1 +
 package.json                                  |   1 +
 yarn.lock                                     |  10 +
 65 files changed, 3329 insertions(+), 131 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/notification_groups.ts
 create mode 100644 app/javascript/mastodon/actions/notifications_migration.tsx
 create mode 100644 app/javascript/mastodon/api/notifications.ts
 create mode 100644 app/javascript/mastodon/api_types/notifications.ts
 create mode 100644 app/javascript/mastodon/api_types/reports.ts
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_v2/index.tsx
 create mode 100644 app/javascript/mastodon/features/notifications_wrapper.jsx
 create mode 100644 app/javascript/mastodon/models/notification_group.ts
 create mode 100644 app/javascript/mastodon/reducers/notification_groups.ts
 create mode 100644 app/javascript/mastodon/selectors/notifications.ts
 create mode 100644 app/javascript/mastodon/selectors/settings.ts

diff --git a/app/controllers/api/v2_alpha/notifications_controller.rb b/app/controllers/api/v2_alpha/notifications_controller.rb
index edba23ab4a..83d40a0886 100644
--- a/app/controllers/api/v2_alpha/notifications_controller.rb
+++ b/app/controllers/api/v2_alpha/notifications_controller.rb
@@ -12,10 +12,27 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
     with_read_replica do
       @notifications = load_notifications
       @group_metadata = load_group_metadata
+      @grouped_notifications = load_grouped_notifications
       @relationships = StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
+      @sample_accounts = @grouped_notifications.flat_map(&:sample_accounts)
+
+      # Preload associations to avoid N+1s
+      ActiveRecord::Associations::Preloader.new(records: @sample_accounts, associations: [:account_stat, { user: :role }]).call
     end
 
-    render json: @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#index rendering') do |span|
+      statuses = @grouped_notifications.filter_map { |group| group.target_status&.id }
+
+      span.add_attributes(
+        'app.notification_grouping.count' => @grouped_notifications.size,
+        'app.notification_grouping.sample_account.count' => @sample_accounts.size,
+        'app.notification_grouping.sample_account.unique_count' => @sample_accounts.pluck(:id).uniq.size,
+        'app.notification_grouping.status.count' => statuses.size,
+        'app.notification_grouping.status.unique_count' => statuses.uniq.size
+      )
+
+      render json: @grouped_notifications, each_serializer: REST::NotificationGroupSerializer, relationships: @relationships, group_metadata: @group_metadata
+    end
   end
 
   def show
@@ -36,25 +53,35 @@ class Api::V2Alpha::NotificationsController < Api::BaseController
   private
 
   def load_notifications
-    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)
-    )
+    MastodonOTELTracer.in_span('Api::V2Alpha::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)
+      )
 
-    Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
-      preload_collection(target_statuses, Status)
+      Notification.preload_cache_collection_target_statuses(notifications) do |target_statuses|
+        preload_collection(target_statuses, Status)
+      end
     end
   end
 
   def load_group_metadata
     return {} if @notifications.empty?
 
-    browserable_account_notifications
-      .where(group_key: @notifications.filter_map(&:group_key))
-      .where(id: (@notifications.last.id)..(@notifications.first.id))
-      .group(:group_key)
-      .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
-      .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_group_metadata') do
+      browserable_account_notifications
+        .where(group_key: @notifications.filter_map(&:group_key))
+        .where(id: (@notifications.last.id)..(@notifications.first.id))
+        .group(:group_key)
+        .pluck(:group_key, 'min(notifications.id) as min_id', 'max(notifications.id) as max_id', 'max(notifications.created_at) as latest_notification_at')
+        .to_h { |group_key, min_id, max_id, latest_notification_at| [group_key, { min_id: min_id, max_id: max_id, latest_notification_at: latest_notification_at }] }
+    end
+  end
+
+  def load_grouped_notifications
+    MastodonOTELTracer.in_span('Api::V2Alpha::NotificationsController#load_grouped_notifications') do
+      @notifications.map { |notification| NotificationGroup.from_notification(notification, max_id: @group_metadata.dig(notification.group_key, :max_id)) }
+    end
   end
 
   def browserable_account_notifications
diff --git a/app/javascript/mastodon/actions/markers.ts b/app/javascript/mastodon/actions/markers.ts
index 03f577c540..77d91d9b9c 100644
--- a/app/javascript/mastodon/actions/markers.ts
+++ b/app/javascript/mastodon/actions/markers.ts
@@ -75,9 +75,17 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // @ts-expect-error state.notifications is not yet typed
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-  return state.getIn(['notifications', 'lastReadId']);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const enableBeta = state.settings.getIn(
+    ['notifications', 'groupingBeta'],
+    false,
+  ) as boolean;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return enableBeta
+    ? 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']);
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
new file mode 100644
index 0000000000..8fdec6e48b
--- /dev/null
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -0,0 +1,144 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import {
+  apiClearNotifications,
+  apiFetchNotifications,
+} from 'mastodon/api/notifications';
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+import type {
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+} from 'mastodon/api_types/notifications';
+import { allNotificationTypes } from 'mastodon/api_types/notifications';
+import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
+import type { NotificationGap } from 'mastodon/reducers/notification_groups';
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+} from 'mastodon/selectors/settings';
+import type { AppDispatch } from 'mastodon/store';
+import {
+  createAppAsyncThunk,
+  createDataLoadingThunk,
+} from 'mastodon/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { NOTIFICATIONS_FILTER_SET } from './notifications';
+import { saveSettings } from './settings';
+
+function excludeAllTypesExcept(filter: string) {
+  return allNotificationTypes.filter((item) => item !== filter);
+}
+
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if ('sample_accounts' in notification) {
+      fetchedAccounts.push(...notification.sample_accounts);
+    }
+
+    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) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotifications = createDataLoadingThunk(
+  'notificationGroups/fetch',
+  async (_params, { getState }) => {
+    const activeFilter =
+      selectSettingsNotificationsQuickFilterActive(getState());
+
+    return apiFetchNotifications({
+      exclude_types:
+        activeFilter === 'all'
+          ? selectSettingsNotificationsExcludedTypes(getState())
+          : excludeAllTypesExcept(activeFilter),
+    });
+  },
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+    const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
+      notifications;
+
+    // TODO: might be worth not using gaps for that…
+    // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri });
+    if (notifications.length > 1)
+      payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id });
+
+    return payload;
+    // dispatch(submitMarkers());
+  },
+);
+
+export const fetchNotificationsGap = createDataLoadingThunk(
+  'notificationGroups/fetchGap',
+  async (params: { gap: NotificationGap }) =>
+    apiFetchNotifications({ max_id: params.gap.maxId }),
+
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
+export const processNewNotificationForGroups = createAppAsyncThunk(
+  'notificationGroups/processNew',
+  (notification: ApiNotificationJSON, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, [notification]);
+
+    return notification;
+  },
+);
+
+export const loadPending = createAction('notificationGroups/loadPending');
+
+export const updateScrollPosition = createAction<{ top: boolean }>(
+  'notificationGroups/updateScrollPosition',
+);
+
+export const setNotificationsFilter = createAppAsyncThunk(
+  'notifications/filter/set',
+  ({ filterType }: { filterType: string }, { dispatch }) => {
+    dispatch({
+      type: NOTIFICATIONS_FILTER_SET,
+      path: ['notifications', 'quickFilter', 'active'],
+      value: filterType,
+    });
+    // dispatch(expandNotifications({ forceLoad: true }));
+    void dispatch(fetchNotifications());
+    dispatch(saveSettings());
+  },
+);
+
+export const clearNotifications = createDataLoadingThunk(
+  'notifications/clear',
+  () => apiClearNotifications(),
+);
+
+export const markNotificationsAsRead = createAction(
+  'notificationGroups/markAsRead',
+);
+
+export const mountNotifications = createAction('notificationGroups/mount');
+export const unmountNotifications = createAction('notificationGroups/unmount');
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 6a59d5624e..7e4320c27b 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -32,7 +32,6 @@ export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 
 export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
 
-export const NOTIFICATIONS_CLEAR        = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP   = 'NOTIFICATIONS_SCROLL_TOP';
 export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 
@@ -174,7 +173,7 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
+export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
@@ -257,16 +256,6 @@ export function expandNotificationsFail(error, isLoadingMore) {
   };
 }
 
-export function clearNotifications() {
-  return (dispatch) => {
-    dispatch({
-      type: NOTIFICATIONS_CLEAR,
-    });
-
-    api().post('/api/v1/notifications/clear');
-  };
-}
-
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
diff --git a/app/javascript/mastodon/actions/notifications_migration.tsx b/app/javascript/mastodon/actions/notifications_migration.tsx
new file mode 100644
index 0000000000..f856e56828
--- /dev/null
+++ b/app/javascript/mastodon/actions/notifications_migration.tsx
@@ -0,0 +1,18 @@
+import { createAppAsyncThunk } from 'mastodon/store';
+
+import { fetchNotifications } from './notification_groups';
+import { expandNotifications } from './notifications';
+
+export const initializeNotifications = createAppAsyncThunk(
+  'notifications/initialize',
+  (_, { dispatch, getState }) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const enableBeta = getState().settings.getIn(
+      ['notifications', 'groupingBeta'],
+      false,
+    ) as boolean;
+
+    if (enableBeta) void dispatch(fetchNotifications());
+    else dispatch(expandNotifications());
+  },
+);
diff --git a/app/javascript/mastodon/actions/notifications_typed.ts b/app/javascript/mastodon/actions/notifications_typed.ts
index 176362f4b1..88d942d45e 100644
--- a/app/javascript/mastodon/actions/notifications_typed.ts
+++ b/app/javascript/mastodon/actions/notifications_typed.ts
@@ -1,11 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import type { ApiAccountJSON } from '../api_types/accounts';
-// To be replaced once ApiNotificationJSON type exists
-interface FakeApiNotificationJSON {
-  type: string;
-  account: ApiAccountJSON;
-}
+import type { ApiNotificationJSON } from 'mastodon/api_types/notifications';
 
 export const notificationsUpdate = createAction(
   'notifications/update',
@@ -13,7 +8,7 @@ export const notificationsUpdate = createAction(
     playSound,
     ...args
   }: {
-    notification: FakeApiNotificationJSON;
+    notification: ApiNotificationJSON;
     usePendingItems: boolean;
     playSound: boolean;
   }) => ({
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index e7fe1c53ed..f50f41b0d9 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -10,6 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
+import { processNewNotificationForGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -98,10 +99,16 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
           break;
-        case 'notification':
+        case 'notification': {
           // @ts-expect-error
-          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
+          const notificationJSON = JSON.parse(data.payload);
+          dispatch(updateNotifications(notificationJSON, messages, locale));
+          // TODO: remove this once the groups feature replaces the previous one
+          if(getState().notificationGroups.groups.length > 0) {
+            dispatch(processNewNotificationForGroups(notificationJSON));
+          }
           break;
+        }
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/mastodon/api/notifications.ts b/app/javascript/mastodon/api/notifications.ts
new file mode 100644
index 0000000000..c1ab6f70ca
--- /dev/null
+++ b/app/javascript/mastodon/api/notifications.ts
@@ -0,0 +1,18 @@
+import api, { apiRequest, getLinks } from 'mastodon/api';
+import type { ApiNotificationGroupJSON } from 'mastodon/api_types/notifications';
+
+export const apiFetchNotifications = async (params?: {
+  exclude_types?: string[];
+  max_id?: string;
+}) => {
+  const response = await api().request<ApiNotificationGroupJSON[]>({
+    method: 'GET',
+    url: '/api/v2_alpha/notifications',
+    params,
+  });
+
+  return { notifications: response.data, links: getLinks(response) };
+};
+
+export const apiClearNotifications = () =>
+  apiRequest<undefined>('POST', 'v1/notifications/clear');
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
new file mode 100644
index 0000000000..d7cbbca73b
--- /dev/null
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -0,0 +1,145 @@
+// See app/serializers/rest/notification_group_serializer.rb
+
+import type { AccountWarningAction } from 'mastodon/models/notification_group';
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiReportJSON } from './reports';
+import type { ApiStatusJSON } from './statuses';
+
+// See app/model/notification.rb
+export const allNotificationTypes = [
+  'follow',
+  'follow_request',
+  'favourite',
+  'reblog',
+  'mention',
+  'poll',
+  'status',
+  'update',
+  'admin.sign_up',
+  'admin.report',
+  'moderation_warning',
+  'severed_relationships',
+];
+
+export type NotificationWithStatusType =
+  | 'favourite'
+  | 'reblog'
+  | 'status'
+  | 'mention'
+  | 'poll'
+  | 'update';
+
+export type NotificationType =
+  | NotificationWithStatusType
+  | 'follow'
+  | 'follow_request'
+  | 'moderation_warning'
+  | 'severed_relationships'
+  | 'admin.sign_up'
+  | 'admin.report';
+
+export interface BaseNotificationJSON {
+  id: string;
+  type: NotificationType;
+  created_at: string;
+  group_key: string;
+  account: ApiAccountJSON;
+}
+
+export interface BaseNotificationGroupJSON {
+  group_key: string;
+  notifications_count: number;
+  type: NotificationType;
+  sample_accounts: ApiAccountJSON[];
+  latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
+  most_recent_notification_id: string;
+  page_min_id?: string;
+  page_max_id?: string;
+}
+
+interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface NotificationWithStatusJSON extends BaseNotificationJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+interface ReportNotificationJSON extends BaseNotificationJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up';
+interface SimpleNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: SimpleNotificationTypes;
+}
+
+interface SimpleNotificationJSON extends BaseNotificationJSON {
+  type: SimpleNotificationTypes;
+}
+
+export interface ApiAccountWarningJSON {
+  id: string;
+  action: AccountWarningAction;
+  text: string;
+  status_ids: string[];
+  created_at: string;
+  target_account: ApiAccountJSON;
+  appeal: unknown;
+}
+
+interface ModerationWarningNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+interface ModerationWarningNotificationJSON extends BaseNotificationJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+export interface ApiAccountRelationshipSeveranceEventJSON {
+  id: string;
+  type: 'account_suspension' | 'domain_block' | 'user_domain_block';
+  purged: boolean;
+  target_name: string;
+  followers_count: number;
+  following_count: number;
+  created_at: string;
+}
+
+interface AccountRelationshipSeveranceNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+interface AccountRelationshipSeveranceNotificationJSON
+  extends BaseNotificationJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+export type ApiNotificationJSON =
+  | SimpleNotificationJSON
+  | ReportNotificationJSON
+  | AccountRelationshipSeveranceNotificationJSON
+  | NotificationWithStatusJSON
+  | ModerationWarningNotificationJSON;
+
+export type ApiNotificationGroupJSON =
+  | SimpleNotificationGroupJSON
+  | ReportNotificationGroupJSON
+  | AccountRelationshipSeveranceNotificationGroupJSON
+  | NotificationGroupWithStatusJSON
+  | ModerationWarningNotificationGroupJSON;
diff --git a/app/javascript/mastodon/api_types/reports.ts b/app/javascript/mastodon/api_types/reports.ts
new file mode 100644
index 0000000000..b11cfdd2eb
--- /dev/null
+++ b/app/javascript/mastodon/api_types/reports.ts
@@ -0,0 +1,16 @@
+import type { ApiAccountJSON } from './accounts';
+
+export type ReportCategory = 'other' | 'spam' | 'legal' | 'violation';
+
+export interface ApiReportJSON {
+  id: string;
+  action_taken: unknown;
+  action_taken_at: unknown;
+  category: ReportCategory;
+  comment: string;
+  forwarded: boolean;
+  created_at: string;
+  status_ids: string[];
+  rule_ids: string[];
+  target_account: ApiAccountJSON;
+}
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index 1d4193a359..544b5e1461 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -9,18 +9,18 @@ const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });
 
-interface Props {
+interface Props<T> {
   disabled: boolean;
-  maxId: string;
-  onClick: (maxId: string) => void;
+  param: T;
+  onClick: (params: T) => void;
 }
 
-export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
   const intl = useIntl();
 
   const handleClick = useCallback(() => {
-    onClick(maxId);
-  }, [maxId, onClick]);
+    onClick(param);
+  }, [param, onClick]);
 
   return (
     <button
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 502dc8bee3..1723080e95 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -116,6 +116,8 @@ class Status extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     scrollKey: PropTypes.string,
+    skipPrepend: PropTypes.bool,
+    avatarSize: PropTypes.number,
     deployPictureInPicture: PropTypes.func,
     pictureInPicture: ImmutablePropTypes.contains({
       inUse: PropTypes.bool,
@@ -353,7 +355,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId } = this.props;
+    const { intl, hidden, featured, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -539,7 +541,7 @@ class Status extends ImmutablePureComponent {
     }
 
     if (account === undefined || account === null) {
-      statusAvatar = <Avatar account={status.get('account')} size={46} />;
+      statusAvatar = <Avatar account={status.get('account')} size={avatarSize} />;
     } else {
       statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
     }
@@ -550,7 +552,7 @@ class Status extends ImmutablePureComponent {
     return (
       <HotKeys handlers={handlers}>
         <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
-          {prepend}
+          {!skipPrepend && prepend}
 
           <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
             {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index fee6675faa..c6cacbd2b2 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -107,7 +107,7 @@ export default class StatusList extends ImmutablePureComponent {
             <LoadGap
               key={'gap:' + statusIds.get(index + 1)}
               disabled={isLoading}
-              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              param={index > 0 ? statusIds.get(index - 1) : null}
               onClick={onLoadMore}
             />
           );
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
index cc37d2d7d8..106ff7bdaa 100644
--- a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -13,6 +13,7 @@ import { cancelReplyCompose } from 'mastodon/actions/compose';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import { EmbeddedStatusContent } from 'mastodon/features/notifications_v2/components/embedded_status_content';
 
 const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
@@ -33,8 +34,6 @@ export const EditIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
@@ -49,7 +48,12 @@ export const EditIndicator = () => {
         </div>
       </div>
 
-      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+      <EmbeddedStatusContent
+        className='edit-indicator__content translate'
+        content={status.get('contentHtml')}
+        language={status.get('language')}
+        mentions={status.get('mentions')}
+      />
 
       {(status.get('poll') || status.get('media_attachments').size > 0) && (
         <div className='edit-indicator__attachments'>
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index b7959e211d..cf5bae2e07 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -9,6 +9,7 @@ import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react'
 import { Avatar } from 'mastodon/components/avatar';
 import { DisplayName } from 'mastodon/components/display_name';
 import { Icon } from 'mastodon/components/icon';
+import { EmbeddedStatusContent } from 'mastodon/features/notifications_v2/components/embedded_status_content';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -19,8 +20,6 @@ export const ReplyIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
@@ -34,7 +33,12 @@ export const ReplyIndicator = () => {
           <DisplayName account={account} />
         </Link>
 
-        <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
+        <EmbeddedStatusContent
+          className='reply-indicator__content translate'
+          content={status.get('contentHtml')}
+          language={status.get('language')}
+          mentions={status.get('mentions')}
+        />
 
         {(status.get('poll') || status.get('media_attachments').size > 0) && (
           <div className='reply-indicator__attachments'>
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 39e394e449..d35e62f8f9 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -53,6 +53,7 @@ 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' />;
@@ -104,6 +105,16 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <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/components/filtered_notifications_banner.tsx b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
index 2c4b3b9717..be1ea2c556 100644
--- a/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx
@@ -35,7 +35,9 @@ export const FilteredNotificationsBanner: React.FC = () => {
       className='filtered-notifications-banner'
       to='/notifications/requests'
     >
-      <Icon icon={InventoryIcon} id='filtered-notifications' />
+      <div className='notification-group__icon'>
+        <Icon icon={InventoryIcon} id='filtered-notifications' />
+      </div>
 
       <div className='filtered-notifications-banner__text'>
         <strong>
diff --git a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
index 2c1683e218..827ec3b378 100644
--- a/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/mastodon/features/notifications/components/moderation_warning.tsx
@@ -1,7 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'mastodon/components/icon';
+import type { AccountWarningAction } from 'mastodon/models/notification_group';
 
 // This needs to be kept in sync with app/models/account_warning.rb
 const messages = defineMessages({
@@ -36,19 +39,18 @@ const messages = defineMessages({
 });
 
 interface Props {
-  action:
-    | 'none'
-    | 'disable'
-    | 'mark_statuses_as_sensitive'
-    | 'delete_statuses'
-    | 'sensitive'
-    | 'silence'
-    | 'suspend';
+  action: AccountWarningAction;
   id: string;
-  hidden: boolean;
+  hidden?: boolean;
+  unread?: boolean;
 }
 
-export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+export const ModerationWarning: React.FC<Props> = ({
+  action,
+  id,
+  hidden,
+  unread,
+}) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -56,23 +58,32 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
   }
 
   return (
-    <a
-      href={`/disputes/strikes/${id}`}
-      target='_blank'
-      rel='noopener noreferrer'
-      className='notification__moderation-warning'
+    <div
+      role='button'
+      className={classNames(
+        'notification-group notification-group--link notification-group--moderation-warning focusable',
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
     >
-      <Icon id='warning' icon={GavelIcon} />
+      <div className='notification-group__icon'>
+        <Icon id='warning' icon={GavelIcon} />
+      </div>
 
-      <div className='notification__moderation-warning__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[action])}</p>
-        <span className='link-button'>
+        <a
+          href={`/disputes/strikes/${id}`}
+          target='_blank'
+          rel='noopener noreferrer'
+          className='link-button'
+        >
           <FormattedMessage
             id='notification.moderation-warning.learn_more'
             defaultMessage='Learn more'
           />
-        </span>
+        </a>
       </div>
-    </a>
+    </div>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 986628fdc8..70a3252509 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -34,7 +34,7 @@ const messages = defineMessages({
   favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your status' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
-  poll: { id: 'notification.poll', defaultMessage: 'A poll you have voted in has ended' },
+  poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
@@ -340,7 +340,7 @@ class Notification extends ImmutablePureComponent {
               {ownPoll ? (
                 <FormattedMessage id='notification.own_poll' defaultMessage='Your poll has ended' />
               ) : (
-                <FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' />
+                <FormattedMessage id='notification.poll' defaultMessage='A poll you voted in has ended' />
               )}
             </span>
           </div>
diff --git a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
index 738159fc5a..3075aff31b 100644
--- a/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/mastodon/features/notifications/components/relationships_severance_event.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { domain } from 'mastodon/initial_state';
@@ -13,7 +15,7 @@ const messages = defineMessages({
   user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden, unread }) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -21,14 +23,14 @@ export const RelationshipsSeveranceEvent = ({ type, target, followingCount, foll
   }
 
   return (
-    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
-      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+    <div role='button' className={classNames('notification-group notification-group--link notification-group--relationships-severance-event focusable', { 'notification-group--unread': unread })} tabIndex='0'>
+      <div className='notification-group__icon'><Icon id='heart_broken' icon={HeartBrokenIcon} /></div>
 
-      <div className='notification__relationships-severance-event__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
-        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
+        <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></a>
       </div>
-    </a>
+    </div>
   );
 };
 
@@ -42,4 +44,5 @@ RelationshipsSeveranceEvent.propTypes = {
   followersCount: PropTypes.number.isRequired,
   followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
+  unread: PropTypes.bool,
 };
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index 94383d0bb5..2434c3982d 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -2,10 +2,13 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { initializeNotifications } from 'mastodon/actions/notifications_migration';
+
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
+import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -58,6 +61,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(changeSetting(['notifications', ...path], checked));
       }
+    } else if(path[0] === 'groupingBeta') {
+      dispatch(changeSetting(['notifications', ...path], checked));
+      dispatch(initializeNotifications());
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
diff --git a/app/javascript/mastodon/features/notifications/index.jsx b/app/javascript/mastodon/features/notifications/index.jsx
index 54883096ef..f5ebe6fe91 100644
--- a/app/javascript/mastodon/features/notifications/index.jsx
+++ b/app/javascript/mastodon/features/notifications/index.jsx
@@ -202,7 +202,7 @@ class Notifications extends PureComponent {
         <LoadGap
           key={'gap:' + notifications.getIn([index + 1, 'id'])}
           disabled={isLoading}
-          maxId={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
+          param={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
           onClick={this.handleLoadGap}
         />
       ) : (
diff --git a/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
new file mode 100644
index 0000000000..b5da8914a1
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/avatar_group.tsx
@@ -0,0 +1,31 @@
+import { Link } from 'react-router-dom';
+
+import { Avatar } from 'mastodon/components/avatar';
+import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+const AvatarWrapper: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <Avatar account={account} size={28} />
+    </Link>
+  );
+};
+
+export const AvatarGroup: React.FC<{ accountIds: string[] }> = ({
+  accountIds,
+}) => (
+  <div className='notification-group__avatar-group'>
+    {accountIds.slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS).map((accountId) => (
+      <AvatarWrapper key={accountId} accountId={accountId} />
+    ))}
+  </div>
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
new file mode 100644
index 0000000000..0881e24e3f
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -0,0 +1,93 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List as ImmutableList, RecordOf } from 'immutable';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'mastodon/components/avatar';
+import { DisplayName } from 'mastodon/components/display_name';
+import { Icon } from 'mastodon/components/icon';
+import type { Status } from 'mastodon/models/status';
+import { useAppSelector } from 'mastodon/store';
+
+import { EmbeddedStatusContent } from './embedded_status_content';
+
+export type Mention = RecordOf<{ url: string; acct: string }>;
+
+export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
+  statusId,
+}) => {
+  const history = useHistory();
+
+  const status = useAppSelector(
+    (state) => state.statuses.get(statusId) as Status | undefined,
+  );
+
+  const account = useAppSelector((state) =>
+    state.accounts.get(status?.get('account') as string),
+  );
+
+  const handleClick = useCallback(() => {
+    if (!account) return;
+
+    history.push(`/@${account.acct}/${statusId}`);
+  }, [statusId, account, history]);
+
+  if (!status) {
+    return null;
+  }
+
+  // Assign status attributes to variables with a forced type, as status is not yet properly typed
+  const contentHtml = status.get('contentHtml') as string;
+  const poll = status.get('poll');
+  const language = status.get('language') as string;
+  const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const mediaAttachmentsSize = (
+    status.get('media_attachments') as ImmutableList<unknown>
+  ).size;
+
+  return (
+    <div className='notification-group__embedded-status'>
+      <div className='notification-group__embedded-status__account'>
+        <Avatar account={account} size={16} />
+        <DisplayName account={account} />
+      </div>
+
+      <EmbeddedStatusContent
+        className='notification-group__embedded-status__content reply-indicator__content translate'
+        content={contentHtml}
+        language={language}
+        mentions={mentions}
+        onClick={handleClick}
+      />
+
+      {(poll || mediaAttachmentsSize > 0) && (
+        <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
+          {!!poll && (
+            <>
+              <Icon icon={BarChart4BarsIcon} id='bar-chart-4-bars' />
+              <FormattedMessage
+                id='reply_indicator.poll'
+                defaultMessage='Poll'
+              />
+            </>
+          )}
+          {mediaAttachmentsSize > 0 && (
+            <>
+              <Icon icon={PhotoLibraryIcon} id='photo-library' />
+              <FormattedMessage
+                id='reply_indicator.attachments'
+                defaultMessage='{count, plural, one {# attachment} other {# attachments}}'
+                values={{ count: mediaAttachmentsSize }}
+              />
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
new file mode 100644
index 0000000000..310a685711
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
@@ -0,0 +1,165 @@
+import { useCallback, useRef } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List } from 'immutable';
+
+import type { History } from 'history';
+
+import type { Mention } from './embedded_status';
+
+const handleMentionClick = (
+  history: History,
+  mention: Mention,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/@${mention.get('acct')}`);
+  }
+};
+
+const handleHashtagClick = (
+  history: History,
+  hashtag: string,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/tags/${hashtag.replace(/^#/, '')}`);
+  }
+};
+
+export const EmbeddedStatusContent: React.FC<{
+  content: string;
+  mentions: List<Mention>;
+  language: string;
+  onClick?: () => void;
+  className?: string;
+}> = ({ content, mentions, language, onClick, className }) => {
+  const clickCoordinatesRef = useRef<[number, number] | null>();
+  const history = useHistory();
+
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && onClick) {
+        onClick();
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, onClick],
+  );
+
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleContentRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!node) {
+        return;
+      }
+
+      const links = node.querySelectorAll<HTMLAnchorElement>('a');
+
+      for (const link of links) {
+        if (link.classList.contains('status-link')) {
+          continue;
+        }
+
+        link.classList.add('status-link');
+
+        const mention = mentions.find((item) => link.href === item.get('url'));
+
+        if (mention) {
+          link.addEventListener(
+            'click',
+            handleMentionClick.bind(null, history, mention),
+            false,
+          );
+          link.setAttribute('title', `@${mention.get('acct')}`);
+          link.setAttribute('href', `/@${mention.get('acct')}`);
+        } else if (
+          link.textContent?.[0] === '#' ||
+          link.previousSibling?.textContent?.endsWith('#')
+        ) {
+          link.addEventListener(
+            'click',
+            handleHashtagClick.bind(null, history, link.text),
+            false,
+          );
+          link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
+        } else {
+          link.setAttribute('title', link.href);
+          link.classList.add('unhandled-link');
+        }
+      }
+    },
+    [mentions, history],
+  );
+
+  return (
+    <div
+      role='button'
+      tabIndex={0}
+      className={className}
+      ref={handleContentRef}
+      lang={language}
+      dangerouslySetInnerHTML={{ __html: content }}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx b/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
new file mode 100644
index 0000000000..3d70cc0b62
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/names_list.tsx
@@ -0,0 +1,51 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'mastodon/store';
+
+export const NamesList: React.FC<{
+  accountIds: string[];
+  total: number;
+  seeMoreHref?: string;
+}> = ({ accountIds, total, seeMoreHref }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  const displayedName = (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+
+  if (total === 1) {
+    return displayedName;
+  }
+
+  if (seeMoreHref)
+    return (
+      <FormattedMessage
+        id='name_and_others_with_link'
+        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
+        values={{
+          name: displayedName,
+          count: total - 1,
+          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
+        }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
+      values={{ name: displayedName, count: total - 1 }}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
new file mode 100644
index 0000000000..fda5798ae9
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
@@ -0,0 +1,132 @@
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import { Icon } from 'mastodon/components/icon';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import type { NotificationGroupAdminReport } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+// This needs to be kept in sync with app/models/report.rb
+const messages = defineMessages({
+  other: {
+    id: 'report_notification.categories.other_sentence',
+    defaultMessage: 'other',
+  },
+  spam: {
+    id: 'report_notification.categories.spam_sentence',
+    defaultMessage: 'spam',
+  },
+  legal: {
+    id: 'report_notification.categories.legal_sentence',
+    defaultMessage: 'illegal content',
+  },
+  violation: {
+    id: 'report_notification.categories.violation_sentence',
+    defaultMessage: 'rule violation',
+  },
+});
+
+export const NotificationAdminReport: React.FC<{
+  notification: NotificationGroupAdminReport;
+  unread?: boolean;
+}> = ({ notification, notification: { report }, unread }) => {
+  const intl = useIntl();
+  const targetAccount = useAppSelector((state) =>
+    state.accounts.get(report.targetAccountId),
+  );
+  const account = useAppSelector((state) =>
+    state.accounts.get(notification.sampleAccountIds[0] ?? '0'),
+  );
+
+  if (!account || !targetAccount) return null;
+
+  const values = {
+    name: (
+      <bdi
+        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
+      />
+    ),
+    target: (
+      <bdi
+        dangerouslySetInnerHTML={{
+          __html: targetAccount.get('display_name_html'),
+        }}
+      />
+    ),
+    category: intl.formatMessage(messages[report.category]),
+    count: report.status_ids.length,
+  };
+
+  let message;
+
+  if (report.status_ids.length > 0) {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account_other'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  } else {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses_other'
+          defaultMessage='{name} reported {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses'
+          defaultMessage='{name} reported {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  }
+
+  return (
+    <a
+      href={`/admin/reports/${report.id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className={classNames(
+        'notification-group notification-group--link notification-group--admin-report focusable',
+        { 'notification-group--unread': unread },
+      )}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='flag' icon={FlagIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__label'>
+            {message}
+            <RelativeTimestamp timestamp={report.created_at} />
+          </div>
+        </div>
+
+        {report.comment.length > 0 && (
+          <div className='notification-group__embedded-status__content'>
+            “{report.comment}”
+          </div>
+        )}
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
new file mode 100644
index 0000000000..9f7afc63f5
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupAdminSignUp } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.admin.sign_up'
+    defaultMessage='{name} signed up'
+    values={values}
+  />
+);
+
+export const NotificationAdminSignUp: React.FC<{
+  notification: NotificationGroupAdminSignUp;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='admin-sign-up'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
new file mode 100644
index 0000000000..22838fe69b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import type { NotificationGroupFavourite } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.favourite'
+    defaultMessage='{name} favorited your status'
+    values={values}
+  />
+);
+
+export const NotificationFavourite: React.FC<{
+  notification: NotificationGroupFavourite;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='favourite'
+      icon={StarIcon}
+      iconId='star'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/favourites` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
new file mode 100644
index 0000000000..0ed96ae636
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupFollow } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow'
+    defaultMessage='{name} followed you'
+    values={values}
+  />
+);
+
+export const NotificationFollow: React.FC<{
+  notification: NotificationGroupFollow;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='follow'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
new file mode 100644
index 0000000000..8c9837efa3
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_follow_request.tsx
@@ -0,0 +1,78 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import {
+  authorizeFollowRequest,
+  rejectFollowRequest,
+} from 'mastodon/actions/accounts';
+import { IconButton } from 'mastodon/components/icon_button';
+import type { NotificationGroupFollowRequest } from 'mastodon/models/notification_group';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const messages = defineMessages({
+  authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
+});
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow_request'
+    defaultMessage='{name} has requested to follow you'
+    values={values}
+  />
+);
+
+export const NotificationFollowRequest: React.FC<{
+  notification: NotificationGroupFollowRequest;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const intl = useIntl();
+
+  const dispatch = useAppDispatch();
+
+  const onAuthorize = useCallback(() => {
+    dispatch(authorizeFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const onReject = useCallback(() => {
+    dispatch(rejectFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const actions = (
+    <div className='notification-group__actions'>
+      <IconButton
+        title={intl.formatMessage(messages.reject)}
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onReject}
+      />
+      <IconButton
+        title={intl.formatMessage(messages.authorize)}
+        icon='check'
+        iconComponent={CheckIcon}
+        onClick={onAuthorize}
+      />
+    </div>
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow-request'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      actions={actions}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
new file mode 100644
index 0000000000..1cfb235b7b
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
@@ -0,0 +1,134 @@
+import { useMemo } from 'react';
+
+import { HotKeys } from 'react-hotkeys';
+
+import type { NotificationGroup as NotificationGroupModel } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import { NotificationAdminReport } from './notification_admin_report';
+import { NotificationAdminSignUp } from './notification_admin_sign_up';
+import { NotificationFavourite } from './notification_favourite';
+import { NotificationFollow } from './notification_follow';
+import { NotificationFollowRequest } from './notification_follow_request';
+import { NotificationMention } from './notification_mention';
+import { NotificationModerationWarning } from './notification_moderation_warning';
+import { NotificationPoll } from './notification_poll';
+import { NotificationReblog } from './notification_reblog';
+import { NotificationSeveredRelationships } from './notification_severed_relationships';
+import { NotificationStatus } from './notification_status';
+import { NotificationUpdate } from './notification_update';
+
+export const NotificationGroup: React.FC<{
+  notificationGroupId: NotificationGroupModel['group_key'];
+  unread: boolean;
+  onMoveUp: (groupId: string) => void;
+  onMoveDown: (groupId: string) => void;
+}> = ({ notificationGroupId, unread, onMoveUp, onMoveDown }) => {
+  const notificationGroup = useAppSelector((state) =>
+    state.notificationGroups.groups.find(
+      (item) => item.type !== 'gap' && item.group_key === notificationGroupId,
+    ),
+  );
+
+  const handlers = useMemo(
+    () => ({
+      moveUp: () => {
+        onMoveUp(notificationGroupId);
+      },
+
+      moveDown: () => {
+        onMoveDown(notificationGroupId);
+      },
+    }),
+    [notificationGroupId, onMoveUp, onMoveDown],
+  );
+
+  if (!notificationGroup || notificationGroup.type === 'gap') return null;
+
+  let content;
+
+  switch (notificationGroup.type) {
+    case 'reblog':
+      content = (
+        <NotificationReblog unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'favourite':
+      content = (
+        <NotificationFavourite
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'severed_relationships':
+      content = (
+        <NotificationSeveredRelationships
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'mention':
+      content = (
+        <NotificationMention unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow':
+      content = (
+        <NotificationFollow unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow_request':
+      content = (
+        <NotificationFollowRequest
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'poll':
+      content = (
+        <NotificationPoll unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'status':
+      content = (
+        <NotificationStatus unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'update':
+      content = (
+        <NotificationUpdate unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'admin.sign_up':
+      content = (
+        <NotificationAdminSignUp
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'admin.report':
+      content = (
+        <NotificationAdminReport
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'moderation_warning':
+      content = (
+        <NotificationModerationWarning
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    default:
+      return null;
+  }
+
+  return <HotKeys handlers={handlers}>{content}</HotKeys>;
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
new file mode 100644
index 0000000000..23004f7ee8
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -0,0 +1,91 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+
+import { AvatarGroup } from './avatar_group';
+import { EmbeddedStatus } from './embedded_status';
+import { NamesList } from './names_list';
+
+export type LabelRenderer = (
+  values: Record<string, React.ReactNode>,
+) => JSX.Element;
+
+export const NotificationGroupWithStatus: React.FC<{
+  icon: IconProp;
+  iconId: string;
+  statusId?: string;
+  actions?: JSX.Element;
+  count: number;
+  accountIds: string[];
+  timestamp: string;
+  labelRenderer: LabelRenderer;
+  labelSeeMoreHref?: string;
+  type: string;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  timestamp,
+  accountIds,
+  actions,
+  count,
+  statusId,
+  labelRenderer,
+  labelSeeMoreHref,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: (
+          <NamesList
+            accountIds={accountIds}
+            total={count}
+            seeMoreHref={labelSeeMoreHref}
+          />
+        ),
+      }),
+    [labelRenderer, accountIds, count, labelSeeMoreHref],
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-group focusable notification-group--${type}`,
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-group__icon'>
+        <Icon icon={icon} id={iconId} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__wrapper'>
+            <AvatarGroup accountIds={accountIds} />
+
+            {actions}
+          </div>
+
+          <div className='notification-group__main__header__label'>
+            {label}
+            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+          </div>
+        </div>
+
+        {statusId && (
+          <div className='notification-group__main__status'>
+            <EmbeddedStatus statusId={statusId} />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
new file mode 100644
index 0000000000..8c584f0ce1
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx
@@ -0,0 +1,55 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
+import type { StatusVisibility } from 'mastodon/api_types/statuses';
+import type { NotificationGroupMention } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.mention'
+    defaultMessage='{name} mentioned you'
+    values={values}
+  />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.private_mention'
+    defaultMessage='{name} privately mentioned you'
+    values={values}
+  />
+);
+
+export const NotificationMention: React.FC<{
+  notification: NotificationGroupMention;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const statusVisibility = useAppSelector(
+    (state) =>
+      state.statuses.getIn([
+        notification.statusId,
+        'visibility',
+      ]) as StatusVisibility,
+  );
+
+  return (
+    <NotificationWithStatus
+      type='mention'
+      icon={ReplyIcon}
+      iconId='reply'
+      accountIds={notification.sampleAccountIds}
+      count={notification.notifications_count}
+      statusId={notification.statusId}
+      labelRenderer={
+        statusVisibility === 'direct'
+          ? privateMentionLabelRenderer
+          : labelRenderer
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
new file mode 100644
index 0000000000..d653385fda
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_moderation_warning.tsx
@@ -0,0 +1,13 @@
+import { ModerationWarning } from 'mastodon/features/notifications/components/moderation_warning';
+import type { NotificationGroupModerationWarning } from 'mastodon/models/notification_group';
+
+export const NotificationModerationWarning: React.FC<{
+  notification: NotificationGroupModerationWarning;
+  unread: boolean;
+}> = ({ notification: { moderationWarning }, unread }) => (
+  <ModerationWarning
+    action={moderationWarning.action}
+    id={moderationWarning.id}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
new file mode 100644
index 0000000000..a7748c2c7c
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_poll.tsx
@@ -0,0 +1,41 @@
+import { FormattedMessage } from 'react-intl';
+
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
+import { me } from 'mastodon/initial_state';
+import type { NotificationGroupPoll } from 'mastodon/models/notification_group';
+
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRendererOther = () => (
+  <FormattedMessage
+    id='notification.poll'
+    defaultMessage='A poll you voted in has ended'
+  />
+);
+
+const labelRendererOwn = () => (
+  <FormattedMessage
+    id='notification.own_poll'
+    defaultMessage='Your poll has ended'
+  />
+);
+
+export const NotificationPoll: React.FC<{
+  notification: NotificationGroupPoll;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='poll'
+    icon={BarChart4BarsIcon}
+    iconId='bar-chart-4-bars'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={
+      notification.sampleAccountIds[0] === me
+        ? labelRendererOwn
+        : labelRendererOther
+    }
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
new file mode 100644
index 0000000000..0625568688
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import type { NotificationGroupReblog } from 'mastodon/models/notification_group';
+import { useAppSelector } from 'mastodon/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.reblog'
+    defaultMessage='{name} boosted your status'
+    values={values}
+  />
+);
+
+export const NotificationReblog: React.FC<{
+  notification: NotificationGroupReblog;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='reblog'
+      icon={RepeatIcon}
+      iconId='repeat'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/reblogs` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
new file mode 100644
index 0000000000..fd92498ea3
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_severed_relationships.tsx
@@ -0,0 +1,15 @@
+import { RelationshipsSeveranceEvent } from 'mastodon/features/notifications/components/relationships_severance_event';
+import type { NotificationGroupSeveredRelationships } from 'mastodon/models/notification_group';
+
+export const NotificationSeveredRelationships: React.FC<{
+  notification: NotificationGroupSeveredRelationships;
+  unread: boolean;
+}> = ({ notification: { event }, unread }) => (
+  <RelationshipsSeveranceEvent
+    type={event.type}
+    target={event.target_name}
+    followersCount={event.followers_count}
+    followingCount={event.following_count}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
new file mode 100644
index 0000000000..9ade355a71
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_status.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import type { NotificationGroupStatus } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.status'
+    defaultMessage='{name} just posted'
+    values={values}
+  />
+);
+
+export const NotificationStatus: React.FC<{
+  notification: NotificationGroupStatus;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='status'
+    icon={NotificationsActiveIcon}
+    iconId='notifications-active'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
new file mode 100644
index 0000000000..c518367bf5
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_update.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupUpdate } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.update'
+    defaultMessage='{name} edited a post'
+    values={values}
+  />
+);
+
+export const NotificationUpdate: React.FC<{
+  notification: NotificationGroupUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
new file mode 100644
index 0000000000..27de76b485
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -0,0 +1,73 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon';
+import Status from 'mastodon/containers/status_container';
+import { useAppSelector } from 'mastodon/store';
+
+import { NamesList } from './names_list';
+import type { LabelRenderer } from './notification_group_with_status';
+
+export const NotificationWithStatus: React.FC<{
+  type: string;
+  icon: IconProp;
+  iconId: string;
+  accountIds: string[];
+  statusId: string;
+  count: number;
+  labelRenderer: LabelRenderer;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  accountIds,
+  statusId,
+  count,
+  labelRenderer,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: <NamesList accountIds={accountIds} total={count} />,
+      }),
+    [labelRenderer, accountIds, count],
+  );
+
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-ungrouped focusable notification-ungrouped--${type}`,
+        {
+          'notification-ungrouped--unread': unread,
+          'notification-ungrouped--direct': isPrivateMention,
+        },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-ungrouped__header'>
+        <div className='notification-ungrouped__header__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
+        {label}
+      </div>
+
+      <Status
+        // @ts-expect-error -- <Status> is not yet typed
+        id={statusId}
+        contextType='notifications'
+        withDismiss
+        skipPrepend
+        avatarSize={40}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx b/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
new file mode 100644
index 0000000000..37d2d864bb
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/filter_bar.tsx
@@ -0,0 +1,145 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { setNotificationsFilter } from 'mastodon/actions/notification_groups';
+import { Icon } from 'mastodon/components/icon';
+import {
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterAdvanced,
+} from 'mastodon/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+const tooltips = defineMessages({
+  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
+  favourites: {
+    id: 'notifications.filter.favourites',
+    defaultMessage: 'Favorites',
+  },
+  boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
+  follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  statuses: {
+    id: 'notifications.filter.statuses',
+    defaultMessage: 'Updates from people you follow',
+  },
+});
+
+const BarButton: React.FC<
+  PropsWithChildren<{
+    selectedFilter: string;
+    type: string;
+    title?: string;
+  }>
+> = ({ selectedFilter, type, title, children }) => {
+  const dispatch = useAppDispatch();
+
+  const onClick = useCallback(() => {
+    void dispatch(setNotificationsFilter({ filterType: type }));
+  }, [dispatch, type]);
+
+  return (
+    <button
+      className={selectedFilter === type ? 'active' : ''}
+      onClick={onClick}
+      title={title}
+    >
+      {children}
+    </button>
+  );
+};
+
+export const FilterBar: React.FC = () => {
+  const intl = useIntl();
+
+  const selectedFilter = useAppSelector(
+    selectSettingsNotificationsQuickFilterActive,
+  );
+  const advancedMode = useAppSelector(
+    selectSettingsNotificationsQuickFilterAdvanced,
+  );
+
+  if (advancedMode)
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='mention'
+          key='mention'
+          title={intl.formatMessage(tooltips.mentions)}
+        >
+          <Icon id='reply-all' icon={ReplyAllIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='favourite'
+          key='favourite'
+          title={intl.formatMessage(tooltips.favourites)}
+        >
+          <Icon id='star' icon={StarIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='reblog'
+          key='reblog'
+          title={intl.formatMessage(tooltips.boosts)}
+        >
+          <Icon id='retweet' icon={RepeatIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='poll'
+          key='poll'
+          title={intl.formatMessage(tooltips.polls)}
+        >
+          <Icon id='tasks' icon={InsertChartIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='status'
+          key='status'
+          title={intl.formatMessage(tooltips.statuses)}
+        >
+          <Icon id='home' icon={HomeIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='follow'
+          key='follow'
+          title={intl.formatMessage(tooltips.follows)}
+        >
+          <Icon id='user-plus' icon={PersonAddIcon} />
+        </BarButton>
+      </div>
+    );
+  else
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton selectedFilter={selectedFilter} type='mention' key='mention'>
+          <FormattedMessage
+            id='notifications.filter.mentions'
+            defaultMessage='Mentions'
+          />
+        </BarButton>
+      </div>
+    );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
new file mode 100644
index 0000000000..fc20f05836
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -0,0 +1,354 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import {
+  fetchNotificationsGap,
+  updateScrollPosition,
+  loadPending,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'mastodon/actions/notification_groups';
+import { compareId } from 'mastodon/compare_id';
+import { Icon } from 'mastodon/components/icon';
+import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
+import { useIdentity } from 'mastodon/identity_context';
+import type { NotificationGap } from 'mastodon/reducers/notification_groups';
+import {
+  selectUnreadNotificationGroupsCount,
+  selectPendingNotificationGroupsCount,
+} from 'mastodon/selectors/notifications';
+import {
+  selectNeedsNotificationPermission,
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+  selectSettingsNotificationsShowUnread,
+} from 'mastodon/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+import type { RootState } from 'mastodon/store';
+
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { submitMarkers } from '../../actions/markers';
+import Column from '../../components/column';
+import { ColumnHeader } from '../../components/column_header';
+import { LoadGap } from '../../components/load_gap';
+import ScrollableList from '../../components/scrollable_list';
+import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
+import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
+
+import { NotificationGroup } from './components/notification_group';
+import { FilterBar } from './filter_bar';
+
+const messages = defineMessages({
+  title: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  markAsRead: {
+    id: 'notifications.mark_as_read',
+    defaultMessage: 'Mark every notification as read',
+  },
+});
+
+const getNotifications = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  (showFilterBar, allowedType, excludedTypes, notifications) => {
+    if (!showFilterBar || allowedType === 'all') {
+      // used if user changed the notification settings after loading the notifications from the server
+      // otherwise a list of notifications will come pre-filtered from the backend
+      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+      return notifications.filter(
+        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+      );
+    }
+    return notifications.filter(
+      (item) => item.type === 'gap' || allowedType === item.type,
+    );
+  },
+);
+
+export const Notifications: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+}> = ({ columnId, multiColumn }) => {
+  const intl = useIntl();
+  const notifications = useAppSelector(getNotifications);
+  const dispatch = useAppDispatch();
+  const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
+  const hasMore = notifications.at(-1)?.type === 'gap';
+
+  const lastReadId = useAppSelector((s) =>
+    selectSettingsNotificationsShowUnread(s)
+      ? s.notificationGroups.lastReadId
+      : '0',
+  );
+
+  const numPending = useAppSelector(selectPendingNotificationGroupsCount);
+
+  const unreadNotificationsCount = useAppSelector(
+    selectUnreadNotificationGroupsCount,
+  );
+
+  const isUnread = unreadNotificationsCount > 0;
+
+  const canMarkAsRead =
+    useAppSelector(selectSettingsNotificationsShowUnread) &&
+    unreadNotificationsCount > 0;
+
+  const needsNotificationPermission = useAppSelector(
+    selectNeedsNotificationPermission,
+  );
+
+  const columnRef = useRef<Column>(null);
+
+  const selectChild = useCallback((index: number, alignTop: boolean) => {
+    const container = columnRef.current?.node as HTMLElement | undefined;
+
+    if (!container) return;
+
+    const element = container.querySelector<HTMLElement>(
+      `article:nth-of-type(${index + 1}) .focusable`,
+    );
+
+    if (element) {
+      if (alignTop && container.scrollTop > element.offsetTop) {
+        element.scrollIntoView(true);
+      } else if (
+        !alignTop &&
+        container.scrollTop + container.clientHeight <
+          element.offsetTop + element.offsetHeight
+      ) {
+        element.scrollIntoView(false);
+      }
+      element.focus();
+    }
+  }, []);
+
+  // Keep track of mounted components for unread notification handling
+  useEffect(() => {
+    dispatch(mountNotifications());
+
+    return () => {
+      dispatch(unmountNotifications());
+      dispatch(updateScrollPosition({ top: false }));
+    };
+  }, [dispatch]);
+
+  const handleLoadGap = useCallback(
+    (gap: NotificationGap) => {
+      void dispatch(fetchNotificationsGap({ gap }));
+    },
+    [dispatch],
+  );
+
+  const handleLoadOlder = useDebouncedCallback(
+    () => {
+      const gap = notifications.at(-1);
+      if (gap?.type === 'gap') void dispatch(fetchNotificationsGap({ gap }));
+    },
+    300,
+    { leading: true },
+  );
+
+  const handleLoadPending = useCallback(() => {
+    dispatch(loadPending());
+  }, [dispatch]);
+
+  const handleScrollToTop = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: true }));
+  }, 100);
+
+  const handleScroll = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: false }));
+  }, 100);
+
+  useEffect(() => {
+    return () => {
+      handleLoadOlder.cancel();
+      handleScrollToTop.cancel();
+      handleScroll.cancel();
+    };
+  }, [handleLoadOlder, handleScrollToTop, handleScroll]);
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('NOTIFICATIONS', {}));
+    }
+  }, [columnId, dispatch]);
+
+  const handleMove = useCallback(
+    (dir: unknown) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleMoveUp = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) - 1;
+      selectChild(elementIndex, true);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMoveDown = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) + 1;
+      selectChild(elementIndex, false);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markNotificationsAsRead());
+    void dispatch(submitMarkers({ immediate: true }));
+  }, [dispatch]);
+
+  const pinned = !!columnId;
+  const emptyMessage = (
+    <FormattedMessage
+      id='empty_column.notifications'
+      defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here."
+    />
+  );
+
+  const { signedIn } = useIdentity();
+
+  const filterBar = signedIn ? <FilterBar /> : null;
+
+  const scrollableContent = useMemo(() => {
+    if (notifications.length === 0 && !hasMore) return null;
+
+    return notifications.map((item) =>
+      item.type === 'gap' ? (
+        <LoadGap
+          key={`${item.maxId}-${item.sinceId}`}
+          disabled={isLoading}
+          param={item}
+          onClick={handleLoadGap}
+        />
+      ) : (
+        <NotificationGroup
+          key={item.group_key}
+          notificationGroupId={item.group_key}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          unread={
+            lastReadId !== '0' &&
+            !!item.page_max_id &&
+            compareId(item.page_max_id, lastReadId) > 0
+          }
+        />
+      ),
+    );
+  }, [
+    notifications,
+    isLoading,
+    hasMore,
+    lastReadId,
+    handleLoadGap,
+    handleMoveUp,
+    handleMoveDown,
+  ]);
+
+  const prepend = (
+    <>
+      {needsNotificationPermission && <NotificationsPermissionBanner />}
+      <FilteredNotificationsBanner />
+    </>
+  );
+
+  const scrollContainer = signedIn ? (
+    <ScrollableList
+      scrollKey={`notifications-${columnId}`}
+      trackScroll={!pinned}
+      isLoading={isLoading}
+      showLoading={isLoading && notifications.length === 0}
+      hasMore={hasMore}
+      numPending={numPending}
+      prepend={prepend}
+      alwaysPrepend
+      emptyMessage={emptyMessage}
+      onLoadMore={handleLoadOlder}
+      onLoadPending={handleLoadPending}
+      onScrollToTop={handleScrollToTop}
+      onScroll={handleScroll}
+      bindToDocument={!multiColumn}
+    >
+      {scrollableContent}
+    </ScrollableList>
+  ) : (
+    <NotSignedInIndicator />
+  );
+
+  const extraButton = canMarkAsRead ? (
+    <button
+      aria-label={intl.formatMessage(messages.markAsRead)}
+      title={intl.formatMessage(messages.markAsRead)}
+      onClick={handleMarkAsRead}
+      className='column-header__button'
+    >
+      <Icon id='done-all' icon={DoneAllIcon} />
+    </button>
+  ) : null;
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={columnRef}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        icon='bell'
+        iconComponent={NotificationsIcon}
+        active={isUnread}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+        extraButton={extraButton}
+      >
+        <ColumnSettingsContainer />
+      </ColumnHeader>
+
+      {filterBar}
+
+      {scrollContainer}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default Notifications;
diff --git a/app/javascript/mastodon/features/notifications_wrapper.jsx b/app/javascript/mastodon/features/notifications_wrapper.jsx
new file mode 100644
index 0000000000..057ed1b395
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_wrapper.jsx
@@ -0,0 +1,13 @@
+import Notifications from 'mastodon/features/notifications';
+import Notifications_v2 from 'mastodon/features/notifications_v2';
+import { useAppSelector } from 'mastodon/store';
+
+export const NotificationsWrapper = (props) => {
+  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+
+  return (
+    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+  );
+};
+
+export default NotificationsWrapper;
\ No newline at end of file
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.jsx b/app/javascript/mastodon/features/ui/components/columns_area.jsx
index 19c2f40ac6..063ac28d96 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.jsx
+++ b/app/javascript/mastodon/features/ui/components/columns_area.jsx
@@ -10,7 +10,7 @@ import { scrollRight } from '../../../scroll';
 import BundleContainer from '../containers/bundle_container';
 import {
   Compose,
-  Notifications,
+  NotificationsWrapper,
   HomeTimeline,
   CommunityTimeline,
   PublicTimeline,
@@ -32,7 +32,7 @@ import NavigationPanel from './navigation_panel';
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
+  'NOTIFICATIONS': NotificationsWrapper,
   'PUBLIC': PublicTimeline,
   'REMOTE': PublicTimeline,
   'COMMUNITY': CommunityTimeline,
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
index ff90eef359..2648923bfc 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx
@@ -34,6 +34,7 @@ import { NavigationPortal } from 'mastodon/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
+import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
 
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
@@ -59,15 +60,19 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
+  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
   const count = useSelector(state => state.getIn(['notifications', 'unread']));
   const intl = useIntl();
 
+  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+
   return (
     <ColumnLink
+      key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      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' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index d9f609620c..f36e0cf501 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -13,6 +13,7 @@ import { HotKeys } from 'react-hotkeys';
 
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
+import { initializeNotifications } from 'mastodon/actions/notifications_migration';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
 import { HoverCardController } from 'mastodon/components/hover_card_controller';
 import { PictureInPicture } from 'mastodon/features/picture_in_picture';
@@ -22,7 +23,6 @@ import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
-import { expandNotifications } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
 import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
@@ -49,7 +49,7 @@ import {
   Favourites,
   DirectTimeline,
   HashtagTimeline,
-  Notifications,
+  NotificationsWrapper,
   NotificationRequests,
   NotificationRequest,
   FollowRequests,
@@ -71,6 +71,7 @@ import {
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
+
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
@@ -205,7 +206,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications' component={NotificationsWrapper} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
             <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
@@ -405,7 +406,7 @@ class UI extends PureComponent {
     if (signedIn) {
       this.props.dispatch(fetchMarkers());
       this.props.dispatch(expandHomeTimeline());
-      this.props.dispatch(expandNotifications());
+      this.props.dispatch(initializeNotifications());
       this.props.dispatch(fetchServerTranslationLanguages());
 
       setTimeout(() => this.props.dispatch(fetchServer()), 3000);
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index b8a2359d92..7c4372d5a6 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -7,7 +7,15 @@ export function Compose () {
 }
 
 export function Notifications () {
-  return import(/* webpackChunkName: "features/notifications" */'../../notifications');
+  return import(/* webpackChunkName: "features/notifications_v1" */'../../notifications');
+}
+
+export function Notifications_v2 () {
+  return import(/* webpackChunkName: "features/notifications_v2" */'../../notifications_v2');
+}
+
+export function NotificationsWrapper () {
+  return import(/* webpackChunkName: "features/notifications" */'../../notifications_wrapper');
 }
 
 export function HomeTimeline () {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 13296e1d20..60bdfd1d44 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -443,6 +443,8 @@
   "mute_modal.title": "Mute user?",
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
+  "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
+  "name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a>",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -470,6 +472,10 @@
   "navigation_bar.security": "Security",
   "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.",
   "notification.admin.report": "{name} reported {target}",
+  "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
+  "notification.admin.report_account_other": "{name} reported {count, plural, one {one post} other {# posts}} from {target}",
+  "notification.admin.report_statuses": "{name} reported {target} for {category}",
+  "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -485,7 +491,8 @@
   "notification.moderation_warning.action_silence": "Your account has been limited.",
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.poll": "A poll you voted in has ended",
+  "notification.private_mention": "{name} privately mentioned you",
   "notification.reblog": "{name} boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -503,6 +510,8 @@
   "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",
@@ -666,9 +675,13 @@
   "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "illegal content",
   "report_notification.categories.other": "Other",
+  "report_notification.categories.other_sentence": "other",
   "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Rule violation",
+  "report_notification.categories.violation_sentence": "rule violation",
   "report_notification.open": "Open report",
   "search.no_recent_searches": "No recent searches",
   "search.placeholder": "Search",
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
new file mode 100644
index 0000000000..5fe1e6f2e4
--- /dev/null
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -0,0 +1,207 @@
+import type {
+  ApiAccountRelationshipSeveranceEventJSON,
+  ApiAccountWarningJSON,
+  BaseNotificationGroupJSON,
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+  NotificationType,
+  NotificationWithStatusType,
+} from 'mastodon/api_types/notifications';
+import type { ApiReportJSON } from 'mastodon/api_types/reports';
+
+// Maximum number of avatars displayed in a notification group
+// This corresponds to the max lenght of `group.sampleAccountIds`
+export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
+
+interface BaseNotificationGroup
+  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  sampleAccountIds: string[];
+}
+
+interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
+  extends BaseNotificationGroup {
+  type: Type;
+  statusId: string;
+}
+
+interface BaseNotification<Type extends NotificationType>
+  extends BaseNotificationGroup {
+  type: Type;
+}
+
+export type NotificationGroupFavourite =
+  BaseNotificationWithStatus<'favourite'>;
+export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
+export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
+export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
+export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
+export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupFollow = BaseNotification<'follow'>;
+export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
+export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
+
+export type AccountWarningAction =
+  | 'none'
+  | 'disable'
+  | 'mark_statuses_as_sensitive'
+  | 'delete_statuses'
+  | 'sensitive'
+  | 'silence'
+  | 'suspend';
+export interface AccountWarning
+  extends Omit<ApiAccountWarningJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupModerationWarning
+  extends BaseNotification<'moderation_warning'> {
+  moderationWarning: AccountWarning;
+}
+
+type AccountRelationshipSeveranceEvent =
+  ApiAccountRelationshipSeveranceEventJSON;
+export interface NotificationGroupSeveredRelationships
+  extends BaseNotification<'severed_relationships'> {
+  event: AccountRelationshipSeveranceEvent;
+}
+
+interface Report extends Omit<ApiReportJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupAdminReport
+  extends BaseNotification<'admin.report'> {
+  report: Report;
+}
+
+export type NotificationGroup =
+  | NotificationGroupFavourite
+  | NotificationGroupReblog
+  | NotificationGroupStatus
+  | NotificationGroupMention
+  | NotificationGroupPoll
+  | NotificationGroupUpdate
+  | NotificationGroupFollow
+  | NotificationGroupFollowRequest
+  | NotificationGroupModerationWarning
+  | NotificationGroupSeveredRelationships
+  | NotificationGroupAdminSignUp
+  | NotificationGroupAdminReport;
+
+function createReportFromJSON(reportJSON: ApiReportJSON): Report {
+  const { target_account, ...report } = reportJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...report,
+  };
+}
+
+function createAccountWarningFromJSON(
+  warningJSON: ApiAccountWarningJSON,
+): AccountWarning {
+  const { target_account, ...warning } = warningJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...warning,
+  };
+}
+
+function createAccountRelationshipSeveranceEventFromJSON(
+  eventJson: ApiAccountRelationshipSeveranceEventJSON,
+): AccountRelationshipSeveranceEvent {
+  return eventJson;
+}
+
+export function createNotificationGroupFromJSON(
+  groupJson: ApiNotificationGroupJSON,
+): NotificationGroup {
+  const { sample_accounts, ...group } = groupJson;
+  const sampleAccountIds = sample_accounts.map((account) => account.id);
+
+  switch (group.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update': {
+      const { status, ...groupWithoutStatus } = group;
+      return {
+        statusId: status.id,
+        sampleAccountIds,
+        ...groupWithoutStatus,
+      };
+    }
+    case 'admin.report': {
+      const { report, ...groupWithoutTargetAccount } = group;
+      return {
+        report: createReportFromJSON(report),
+        sampleAccountIds,
+        ...groupWithoutTargetAccount,
+      };
+    }
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(group.event),
+        sampleAccountIds,
+      };
+
+    case 'moderation_warning': {
+      const { moderation_warning, ...groupWithoutModerationWarning } = group;
+      return {
+        ...groupWithoutModerationWarning,
+        moderationWarning: createAccountWarningFromJSON(moderation_warning),
+        sampleAccountIds,
+      };
+    }
+    default:
+      return {
+        sampleAccountIds,
+        ...group,
+      };
+  }
+}
+
+export function createNotificationGroupFromNotificationJSON(
+  notification: ApiNotificationJSON,
+) {
+  const group = {
+    sampleAccountIds: [notification.account.id],
+    group_key: notification.group_key,
+    notifications_count: 1,
+    type: notification.type,
+    most_recent_notification_id: notification.id,
+    page_min_id: notification.id,
+    page_max_id: notification.id,
+    latest_page_notification_at: notification.created_at,
+  } as NotificationGroup;
+
+  switch (notification.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update':
+      return { ...group, statusId: notification.status.id };
+    case 'admin.report':
+      return { ...group, report: createReportFromJSON(notification.report) };
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(
+          notification.event,
+        ),
+      };
+    case 'moderation_warning':
+      return {
+        ...group,
+        moderationWarning: createAccountWarningFromJSON(
+          notification.moderation_warning,
+        ),
+      };
+    default:
+      return group;
+  }
+}
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index 6296ef2026..b92de0dbcd 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -24,6 +24,7 @@ import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
+import { notificationGroupsReducer } from './notification_groups';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -65,6 +66,7 @@ const reducers = {
   search,
   media_attachments,
   notifications,
+  notificationGroups: notificationGroupsReducer,
   height_cache,
   custom_emojis,
   lists,
diff --git a/app/javascript/mastodon/reducers/markers.ts b/app/javascript/mastodon/reducers/markers.ts
index ec85d0f173..b1f10b5fa2 100644
--- a/app/javascript/mastodon/reducers/markers.ts
+++ b/app/javascript/mastodon/reducers/markers.ts
@@ -1,6 +1,7 @@
 import { createReducer } from '@reduxjs/toolkit';
 
-import { submitMarkersAction } from 'mastodon/actions/markers';
+import { submitMarkersAction, fetchMarkers } from 'mastodon/actions/markers';
+import { compareId } from 'mastodon/compare_id';
 
 const initialState = {
   home: '0',
@@ -15,4 +16,23 @@ export const markersReducer = createReducer(initialState, (builder) => {
       if (notifications) state.notifications = notifications;
     },
   );
+  builder.addCase(
+    fetchMarkers.fulfilled,
+    (
+      state,
+      {
+        payload: {
+          markers: { home, notifications },
+        },
+      },
+    ) => {
+      if (home && compareId(home.last_read_id, state.home) > 0)
+        state.home = home.last_read_id;
+      if (
+        notifications &&
+        compareId(notifications.last_read_id, state.notifications) > 0
+      )
+        state.notifications = notifications.last_read_id;
+    },
+  );
 });
diff --git a/app/javascript/mastodon/reducers/notification_groups.ts b/app/javascript/mastodon/reducers/notification_groups.ts
new file mode 100644
index 0000000000..e59f3e7ca1
--- /dev/null
+++ b/app/javascript/mastodon/reducers/notification_groups.ts
@@ -0,0 +1,508 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  authorizeFollowRequestSuccess,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  rejectFollowRequestSuccess,
+} from 'mastodon/actions/accounts_typed';
+import { focusApp, unfocusApp } from 'mastodon/actions/app';
+import { blockDomainSuccess } from 'mastodon/actions/domain_blocks_typed';
+import { fetchMarkers } from 'mastodon/actions/markers';
+import {
+  clearNotifications,
+  fetchNotifications,
+  fetchNotificationsGap,
+  processNewNotificationForGroups,
+  loadPending,
+  updateScrollPosition,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'mastodon/actions/notification_groups';
+import {
+  disconnectTimeline,
+  timelineDelete,
+} from 'mastodon/actions/timelines_typed';
+import type { ApiNotificationJSON } from 'mastodon/api_types/notifications';
+import { compareId } from 'mastodon/compare_id';
+import { usePendingItems } from 'mastodon/initial_state';
+import {
+  NOTIFICATIONS_GROUP_MAX_AVATARS,
+  createNotificationGroupFromJSON,
+  createNotificationGroupFromNotificationJSON,
+} from 'mastodon/models/notification_group';
+import type { NotificationGroup } from 'mastodon/models/notification_group';
+
+const NOTIFICATIONS_TRIM_LIMIT = 50;
+
+export interface NotificationGap {
+  type: 'gap';
+  maxId?: string;
+  sinceId?: string;
+}
+
+interface NotificationGroupsState {
+  groups: (NotificationGroup | NotificationGap)[];
+  pendingGroups: (NotificationGroup | NotificationGap)[];
+  scrolledToTop: boolean;
+  isLoading: boolean;
+  lastReadId: string;
+  mounted: number;
+  isTabVisible: boolean;
+}
+
+const initialState: NotificationGroupsState = {
+  groups: [],
+  pendingGroups: [], // holds pending groups in slow mode
+  scrolledToTop: false,
+  isLoading: false,
+  // The following properties are used to track unread notifications
+  lastReadId: '0', // used for unread notifications
+  mounted: 0, // number of mounted notification list components, usually 0 or 1
+  isTabVisible: true,
+};
+
+function filterNotificationsForAccounts(
+  groups: NotificationGroupsState['groups'],
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  groups = groups
+    .map((group) => {
+      if (
+        group.type !== 'gap' &&
+        (!onlyForType || group.type === onlyForType)
+      ) {
+        const previousLength = group.sampleAccountIds.length;
+
+        group.sampleAccountIds = group.sampleAccountIds.filter(
+          (id) => !accountIds.includes(id),
+        );
+
+        const newLength = group.sampleAccountIds.length;
+        const removed = previousLength - newLength;
+
+        group.notifications_count -= removed;
+      }
+
+      return group;
+    })
+    .filter(
+      (group) => group.type === 'gap' || group.sampleAccountIds.length > 0,
+    );
+  mergeGaps(groups);
+  return groups;
+}
+
+function filterNotificationsForStatus(
+  groups: NotificationGroupsState['groups'],
+  statusId: string,
+) {
+  groups = groups.filter(
+    (group) =>
+      group.type === 'gap' ||
+      !('statusId' in group) ||
+      group.statusId !== statusId,
+  );
+  mergeGaps(groups);
+  return groups;
+}
+
+function removeNotificationsForAccounts(
+  state: NotificationGroupsState,
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  state.groups = filterNotificationsForAccounts(
+    state.groups,
+    accountIds,
+    onlyForType,
+  );
+  state.pendingGroups = filterNotificationsForAccounts(
+    state.pendingGroups,
+    accountIds,
+    onlyForType,
+  );
+}
+
+function removeNotificationsForStatus(
+  state: NotificationGroupsState,
+  statusId: string,
+) {
+  state.groups = filterNotificationsForStatus(state.groups, statusId);
+  state.pendingGroups = filterNotificationsForStatus(
+    state.pendingGroups,
+    statusId,
+  );
+}
+
+function isNotificationGroup(
+  groupOrGap: NotificationGroup | NotificationGap,
+): groupOrGap is NotificationGroup {
+  return groupOrGap.type !== 'gap';
+}
+
+// Merge adjacent gaps in `groups` in-place
+function mergeGaps(groups: NotificationGroupsState['groups']) {
+  for (let i = 0; i < groups.length; i++) {
+    const firstGroupOrGap = groups[i];
+
+    if (firstGroupOrGap?.type === 'gap') {
+      let lastGap = firstGroupOrGap;
+      let j = i + 1;
+
+      for (; j < groups.length; j++) {
+        const groupOrGap = groups[j];
+        if (groupOrGap?.type === 'gap') lastGap = groupOrGap;
+        else break;
+      }
+
+      if (j - i > 1) {
+        groups.splice(i, j - i, {
+          type: 'gap',
+          maxId: firstGroupOrGap.maxId,
+          sinceId: lastGap.sinceId,
+        });
+      }
+    }
+  }
+}
+
+// Checks if `groups[index-1]` and `groups[index]` are gaps, and merge them in-place if they are
+function mergeGapsAround(
+  groups: NotificationGroupsState['groups'],
+  index: number,
+) {
+  if (index > 0) {
+    const potentialFirstGap = groups[index - 1];
+    const potentialSecondGap = groups[index];
+
+    if (
+      potentialFirstGap?.type === 'gap' &&
+      potentialSecondGap?.type === 'gap'
+    ) {
+      groups.splice(index - 1, 2, {
+        type: 'gap',
+        maxId: potentialFirstGap.maxId,
+        sinceId: potentialSecondGap.sinceId,
+      });
+    }
+  }
+}
+
+function processNewNotification(
+  groups: NotificationGroupsState['groups'],
+  notification: ApiNotificationJSON,
+) {
+  const existingGroupIndex = groups.findIndex(
+    (group) =>
+      group.type !== 'gap' && group.group_key === notification.group_key,
+  );
+
+  // In any case, we are going to add a group at the top
+  // If there is currently a gap at the top, now is the time to update it
+  if (groups.length > 0 && groups[0]?.type === 'gap') {
+    groups[0].maxId = notification.id;
+  }
+
+  if (existingGroupIndex > -1) {
+    const existingGroup = groups[existingGroupIndex];
+
+    if (
+      existingGroup &&
+      existingGroup.type !== 'gap' &&
+      !existingGroup.sampleAccountIds.includes(notification.account.id) // This can happen for example if you like, then unlike, then like again the same post
+    ) {
+      // Update the existing group
+      if (
+        existingGroup.sampleAccountIds.unshift(notification.account.id) >
+        NOTIFICATIONS_GROUP_MAX_AVATARS
+      )
+        existingGroup.sampleAccountIds.pop();
+
+      existingGroup.most_recent_notification_id = notification.id;
+      existingGroup.page_max_id = notification.id;
+      existingGroup.latest_page_notification_at = notification.created_at;
+      existingGroup.notifications_count += 1;
+
+      groups.splice(existingGroupIndex, 1);
+      mergeGapsAround(groups, existingGroupIndex);
+
+      groups.unshift(existingGroup);
+    }
+  } else {
+    // Create a new group
+    groups.unshift(createNotificationGroupFromNotificationJSON(notification));
+  }
+}
+
+function trimNotifications(state: NotificationGroupsState) {
+  if (state.scrolledToTop) {
+    state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+  }
+}
+
+function shouldMarkNewNotificationsAsRead(
+  {
+    isTabVisible,
+    scrolledToTop,
+    mounted,
+    lastReadId,
+    groups,
+  }: NotificationGroupsState,
+  ignoreScroll = false,
+) {
+  const isMounted = mounted > 0;
+  const oldestGroup = groups.findLast(isNotificationGroup);
+  const hasMore = groups.at(-1)?.type === 'gap';
+  const oldestGroupReached =
+    !hasMore ||
+    lastReadId === '0' ||
+    (oldestGroup?.page_min_id &&
+      compareId(oldestGroup.page_min_id, lastReadId) <= 0);
+
+  return (
+    isTabVisible &&
+    (ignoreScroll || scrolledToTop) &&
+    isMounted &&
+    oldestGroupReached
+  );
+}
+
+function updateLastReadId(
+  state: NotificationGroupsState,
+  group: NotificationGroup | undefined = undefined,
+) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    group = group ?? state.groups.find(isNotificationGroup);
+    if (
+      group?.page_max_id &&
+      compareId(state.lastReadId, group.page_max_id) < 0
+    )
+      state.lastReadId = group.page_max_id;
+  }
+}
+
+export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
+  initialState,
+  (builder) => {
+    builder
+      .addCase(fetchNotifications.fulfilled, (state, action) => {
+        state.groups = action.payload.map((json) =>
+          json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
+        );
+        state.isLoading = false;
+        updateLastReadId(state);
+      })
+      .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
+        const { notifications } = action.payload;
+
+        // find the gap in the existing notifications
+        const gapIndex = state.groups.findIndex(
+          (groupOrGap) =>
+            groupOrGap.type === 'gap' &&
+            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
+            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        );
+
+        if (gapIndex < 0)
+          // We do not know where to insert, let's return
+          return;
+
+        // Filling a disconnection gap means we're getting historical data
+        // about groups we may know or may not know about.
+
+        // The notifications timeline is split in two by the gap, with
+        // group information newer than the gap, and group information older
+        // than the gap.
+
+        // Filling a gap should not touch anything before the gap, so any
+        // information on groups already appearing before the gap should be
+        // discarded, while any information on groups appearing after the gap
+        // can be updated and re-ordered.
+
+        const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+        // replace the gap with the notifications + a new gap
+
+        const newerGroupKeys = state.groups
+          .slice(0, gapIndex)
+          .filter(isNotificationGroup)
+          .map((group) => group.group_key);
+
+        const toInsert: NotificationGroupsState['groups'] = notifications
+          .map((json) => createNotificationGroupFromJSON(json))
+          .filter(
+            (notification) => !newerGroupKeys.includes(notification.group_key),
+          );
+
+        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+          (group) => group.group_key,
+        );
+
+        const sinceId = action.meta.arg.gap.sinceId;
+        if (
+          notifications.length > 0 &&
+          !(
+            oldestPageNotification &&
+            sinceId &&
+            compareId(oldestPageNotification, sinceId) <= 0
+          )
+        ) {
+          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+          toInsert.push({
+            type: 'gap',
+            maxId: notifications.at(-1)?.page_max_id,
+            sinceId,
+          } as NotificationGap);
+        }
+
+        // Remove older groups covered by the API
+        state.groups = state.groups.filter(
+          (groupOrGap) =>
+            groupOrGap.type !== 'gap' &&
+            !apiGroupKeys.includes(groupOrGap.group_key),
+        );
+
+        // Replace the gap with API results (+ the new gap if needed)
+        state.groups.splice(gapIndex, 1, ...toInsert);
+
+        // Finally, merge any adjacent gaps that could have been created by filtering
+        // groups earlier
+        mergeGaps(state.groups);
+
+        state.isLoading = false;
+
+        updateLastReadId(state);
+      })
+      .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
+        const notification = action.payload;
+        processNewNotification(
+          usePendingItems ? state.pendingGroups : state.groups,
+          notification,
+        );
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(disconnectTimeline, (state, action) => {
+        if (action.payload.timeline === 'home') {
+          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
+            state.groups.unshift({
+              type: 'gap',
+              sinceId: state.groups[0]?.page_min_id,
+            });
+          }
+        }
+      })
+      .addCase(timelineDelete, (state, action) => {
+        removeNotificationsForStatus(state, action.payload.statusId);
+      })
+      .addCase(clearNotifications.pending, (state) => {
+        state.groups = [];
+        state.pendingGroups = [];
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeNotificationsForAccounts(state, [action.payload.relationship.id]);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeNotificationsForAccounts(state, [
+            action.payload.relationship.id,
+          ]);
+      })
+      .addCase(blockDomainSuccess, (state, action) => {
+        removeNotificationsForAccounts(
+          state,
+          action.payload.accounts.map((account) => account.id),
+        );
+      })
+      .addCase(loadPending, (state) => {
+        // First, remove any existing group and merge data
+        state.pendingGroups.forEach((group) => {
+          if (group.type !== 'gap') {
+            const existingGroupIndex = state.groups.findIndex(
+              (groupOrGap) =>
+                isNotificationGroup(groupOrGap) &&
+                groupOrGap.group_key === group.group_key,
+            );
+            if (existingGroupIndex > -1) {
+              const existingGroup = state.groups[existingGroupIndex];
+              if (existingGroup && existingGroup.type !== 'gap') {
+                group.notifications_count += existingGroup.notifications_count;
+                group.sampleAccountIds = group.sampleAccountIds
+                  .concat(existingGroup.sampleAccountIds)
+                  .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+                state.groups.splice(existingGroupIndex, 1);
+              }
+            }
+          }
+          trimNotifications(state);
+        });
+
+        // Then build the consolidated list and clear pending groups
+        state.groups = state.pendingGroups.concat(state.groups);
+        state.pendingGroups = [];
+      })
+      .addCase(updateScrollPosition, (state, action) => {
+        state.scrolledToTop = action.payload.top;
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(markNotificationsAsRead, (state) => {
+        const mostRecentGroup = state.groups.find(isNotificationGroup);
+        if (
+          mostRecentGroup?.page_max_id &&
+          compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
+        )
+          state.lastReadId = mostRecentGroup.page_max_id;
+      })
+      .addCase(fetchMarkers.fulfilled, (state, action) => {
+        if (
+          action.payload.markers.notifications &&
+          compareId(
+            state.lastReadId,
+            action.payload.markers.notifications.last_read_id,
+          ) < 0
+        )
+          state.lastReadId = action.payload.markers.notifications.last_read_id;
+      })
+      .addCase(mountNotifications, (state) => {
+        state.mounted += 1;
+        updateLastReadId(state);
+      })
+      .addCase(unmountNotifications, (state) => {
+        state.mounted -= 1;
+      })
+      .addCase(focusApp, (state) => {
+        state.isTabVisible = true;
+        updateLastReadId(state);
+      })
+      .addCase(unfocusApp, (state) => {
+        state.isTabVisible = false;
+      })
+      .addMatcher(
+        isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
+        (state, action) => {
+          removeNotificationsForAccounts(
+            state,
+            [action.payload.id],
+            'follow_request',
+          );
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        (state) => {
+          state.isLoading = false;
+        },
+      );
+  },
+);
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 79aa5651ff..622f5e8e88 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -16,13 +16,13 @@ import {
 import {
   fetchMarkers,
 } from '../actions/markers';
+import { clearNotifications } from '../actions/notification_groups';
 import {
   notificationsUpdate,
   NOTIFICATIONS_EXPAND_SUCCESS,
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_FILTER_SET,
-  NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
   NOTIFICATIONS_LOAD_PENDING,
   NOTIFICATIONS_MOUNT,
@@ -290,7 +290,7 @@ export default function notifications(state = initialState, action) {
   case authorizeFollowRequestSuccess.type:
   case rejectFollowRequestSuccess.type:
     return filterNotifications(state, [action.payload.id], 'follow_request');
-  case NOTIFICATIONS_CLEAR:
+  case clearNotifications.pending.type:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case timelineDelete.type:
     return deleteByStatus(state, action.payload.statusId);
diff --git a/app/javascript/mastodon/selectors/notifications.ts b/app/javascript/mastodon/selectors/notifications.ts
new file mode 100644
index 0000000000..1b1ed2154c
--- /dev/null
+++ b/app/javascript/mastodon/selectors/notifications.ts
@@ -0,0 +1,34 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import { compareId } from 'mastodon/compare_id';
+import type { RootState } from 'mastodon/store';
+
+export const selectUnreadNotificationGroupsCount = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.lastReadId,
+    (s: RootState) => s.notificationGroups.pendingGroups,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, pendingGroups, groups) => {
+    return (
+      groups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length +
+      pendingGroups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length
+    );
+  },
+);
+
+export const selectPendingNotificationGroupsCount = createSelector(
+  [(s: RootState) => s.notificationGroups.pendingGroups],
+  (pendingGroups) =>
+    pendingGroups.filter((group) => group.type !== 'gap').length,
+);
diff --git a/app/javascript/mastodon/selectors/settings.ts b/app/javascript/mastodon/selectors/settings.ts
new file mode 100644
index 0000000000..64d9440bc8
--- /dev/null
+++ b/app/javascript/mastodon/selectors/settings.ts
@@ -0,0 +1,40 @@
+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 selectSettingsNotificationsExcludedTypes = (state: RootState) =>
+  Object.entries(selectSettingsNotificationsShows(state))
+    .filter(([_type, enabled]) => !enabled)
+    .map(([type, _enabled]) => type);
+
+export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;
+
+export const selectSettingsNotificationsQuickFilterActive = (
+  state: RootState,
+) => state.settings.getIn(['notifications', 'quickFilter', 'active']) as string;
+
+export const selectSettingsNotificationsQuickFilterAdvanced = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
+
+export const selectSettingsNotificationsShowUnread = (state: RootState) =>
+  state.settings.getIn(['notifications', 'showUnread']) as boolean;
+
+export const selectNeedsNotificationPermission = (state: RootState) =>
+  (state.settings.getIn(['notifications', 'alerts']).includes(true) &&
+    state.notifications.get('browserSupport') &&
+    state.notifications.get('browserPermission') === 'default' &&
+    !state.settings.getIn([
+      'notifications',
+      'dismissPermissionBanner',
+    ])) as boolean;
+
+/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e94ce2d8f4..5a0a41c978 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1611,14 +1611,19 @@ body > [data-popper-placement] {
   }
 }
 
-.status__wrapper-direct {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
   background: rgba($ui-highlight-color, 0.05);
 
   &:focus {
-    background: rgba($ui-highlight-color, 0.05);
+    background: rgba($ui-highlight-color, 0.1);
   }
+}
 
-  .status__prepend {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
+  .status__prepend,
+  .notification-ungrouped__header {
     color: $highlight-text-color;
   }
 }
@@ -2209,41 +2214,28 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event,
-.notification__moderation-warning {
-  display: flex;
-  gap: 16px;
+.notification-group--link {
   color: $secondary-text-color;
   text-decoration: none;
-  align-items: flex-start;
-  padding: 16px 32px;
-  border-bottom: 1px solid var(--background-border-color);
 
-  &:hover {
-    color: $primary-text-color;
-  }
-
-  .icon {
-    padding: 2px;
-    color: $highlight-text-color;
-  }
-
-  &__content {
+  .notification-group__main {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 8px;
     flex-grow: 1;
-    font-size: 16px;
-    line-height: 24px;
+    font-size: 15px;
+    line-height: 22px;
 
-    strong {
+    strong,
+    bdi {
       font-weight: 700;
     }
 
     .link-button {
       font-size: inherit;
       line-height: inherit;
+      font-weight: inherit;
     }
   }
 }
@@ -10193,8 +10185,8 @@ noscript {
   display: flex;
   align-items: center;
   border-bottom: 1px solid var(--background-border-color);
-  padding: 24px 32px;
-  gap: 16px;
+  padding: 16px 24px;
+  gap: 8px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10204,10 +10196,8 @@ noscript {
     color: $secondary-text-color;
   }
 
-  .icon {
-    width: 24px;
-    height: 24px;
-    padding: 2px;
+  .notification-group__icon {
+    color: inherit;
   }
 
   &__text {
@@ -10345,6 +10335,251 @@ noscript {
   }
 }
 
+.notification-group {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__icon {
+    width: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+    color: $dark-text-color;
+
+    .icon {
+      width: 28px;
+      height: 28px;
+    }
+  }
+
+  &--follow &__icon,
+  &--follow-request &__icon {
+    color: $highlight-text-color;
+  }
+
+  &--favourite &__icon {
+    color: $gold-star;
+  }
+
+  &--reblog &__icon {
+    color: $valid-value-color;
+  }
+
+  &--relationships-severance-event &__icon,
+  &--admin-report &__icon,
+  &--admin-sign-up &__icon {
+    color: $dark-text-color;
+  }
+
+  &--moderation-warning &__icon {
+    color: $red-bookmark;
+  }
+
+  &--follow-request &__actions {
+    align-items: center;
+    display: flex;
+    gap: 8px;
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 50%;
+      padding: 1px;
+    }
+  }
+
+  &__main {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    flex: 1 1 auto;
+    overflow: hidden;
+
+    &__header {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      &__wrapper {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      &__label {
+        display: flex;
+        gap: 8px;
+        font-size: 15px;
+        line-height: 22px;
+        color: $darker-text-color;
+
+        a {
+          color: inherit;
+          text-decoration: none;
+        }
+
+        bdi {
+          font-weight: 700;
+          color: $primary-text-color;
+        }
+
+        time {
+          color: $dark-text-color;
+        }
+      }
+    }
+
+    &__status {
+      border: 1px solid var(--background-border-color);
+      border-radius: 8px;
+      padding: 8px;
+    }
+  }
+
+  &__avatar-group {
+    display: flex;
+    gap: 8px;
+    height: 28px;
+    overflow-y: hidden;
+    flex-wrap: wrap;
+  }
+
+  .status {
+    padding: 0;
+    border: 0;
+  }
+
+  &__embedded-status {
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    .account__avatar {
+      opacity: 0.5;
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      cursor: pointer;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+  }
+}
+
+.notification-ungrouped {
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: $dark-text-color;
+    font-size: 15px;
+    line-height: 22px;
+    font-weight: 500;
+    padding-inline-start: 24px;
+    margin-bottom: 16px;
+
+    &__icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 0 0 auto;
+
+      .icon {
+        width: 16px;
+        height: 16px;
+      }
+    }
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
+  .status {
+    border: 0;
+    padding: 0;
+
+    &__avatar {
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  .status__wrapper-direct {
+    background: transparent;
+  }
+
+  $icon-margin: 48px; // 40px avatar + 8px gap
+
+  .status__content,
+  .status__action-bar,
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .picture-in-picture-placeholder,
+  .more-from-author,
+  .status-card,
+  .hashtag-bar {
+    margin-inline-start: $icon-margin;
+    width: calc(100% - $icon-margin);
+  }
+
+  .more-from-author {
+    width: calc(100% - $icon-margin + 2px);
+  }
+
+  .status__content__read-more-button {
+    margin-inline-start: $icon-margin;
+  }
+
+  .notification__report {
+    border: 0;
+    padding: 0;
+  }
+}
+
+.notification-group--unread,
+.notification-ungrouped--unread {
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100%;
+    border-inline-start: 4px solid $highlight-text-color;
+    pointer-events: none;
+  }
+}
+
 .hover-card-controller[data-popper-reference-hidden='true'] {
   opacity: 0;
   pointer-events: none;
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 01abe74f5e..6d40411478 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,6 +30,7 @@ class Notification < ApplicationRecord
     'Poll' => :poll,
   }.freeze
 
+  # Please update app/javascript/api_types/notification.ts if you change this
   PROPERTIES = {
     mention: {
       filterable: true,
diff --git a/app/models/notification_group.rb b/app/models/notification_group.rb
index b1cbd7c19a..223945f07b 100644
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@@ -3,13 +3,17 @@
 class NotificationGroup < ActiveModelSerializers::Model
   attributes :group_key, :sample_accounts, :notifications_count, :notification, :most_recent_notification_id
 
+  # Try to keep this consistent with `app/javascript/mastodon/models/notification_group.ts`
+  SAMPLE_ACCOUNTS_SIZE = 8
+
   def self.from_notification(notification, max_id: nil)
     if notification.group_key.present?
-      # TODO: caching and preloading
+      # TODO: caching, and, if caching, preloading
       scope = notification.account.notifications.where(group_key: notification.group_key)
       scope = scope.where(id: ..max_id) if max_id.present?
 
-      most_recent_notifications = scope.order(id: :desc).take(3)
+      # Ideally, we would not load accounts for each notification group
+      most_recent_notifications = scope.order(id: :desc).includes(:from_account).take(SAMPLE_ACCOUNTS_SIZE)
       most_recent_id = most_recent_notifications.first.id
       sample_accounts = most_recent_notifications.map(&:from_account)
       notifications_count = scope.count
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index 9aa5663f4e..749f717754 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationGroupSerializer < ActiveModel::Serializer
+  # Please update app/javascript/api_types/notification.ts when making changes to the attributes
   attributes :group_key, :notifications_count, :type, :most_recent_notification_id
 
   attribute :page_min_id, if: :paginated?
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index ee17af8076..320bc86961 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class REST::NotificationSerializer < ActiveModel::Serializer
+  # Please update app/javascript/api_types/notification.ts when making changes to the attributes
   attributes :id, :type, :created_at, :group_key
 
   attribute :filtered, if: :filtered?
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index d69b5af141..acbb3fc784 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -4,7 +4,6 @@ class NotifyService < BaseService
   include Redisable
 
   MAXIMUM_GROUP_SPAN_HOURS = 12
-  MAXIMUM_GROUP_GAP_TIME = 4.hours.to_i
 
   NON_EMAIL_TYPES = %i(
     admin.report
@@ -217,9 +216,8 @@ class NotifyService < BaseService
     previous_bucket = redis.get(redis_key).to_i
     hour_bucket = previous_bucket if hour_bucket < previous_bucket + MAXIMUM_GROUP_SPAN_HOURS
 
-    # Do not track groups past a given inactivity time
     # We do not concern ourselves with race conditions since we use hour buckets
-    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_GAP_TIME)
+    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS)
 
     "#{type_prefix}-#{hour_bucket}"
   end
diff --git a/config/routes.rb b/config/routes.rb
index e4f091043d..93bdb95969 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,6 +29,7 @@ Rails.application.routes.draw do
     /lists/(*any)
     /links/(*any)
     /notifications/(*any)
+    /notifications_v2/(*any)
     /favourites
     /bookmarks
     /pinned
diff --git a/package.json b/package.json
index 404c4f486f..4571ca03af 100644
--- a/package.json
+++ b/package.json
@@ -123,6 +123,7 @@
     "tesseract.js": "^2.1.5",
     "tiny-queue": "^0.2.1",
     "twitter-text": "3.1.0",
+    "use-debounce": "^10.0.0",
     "webpack": "^4.47.0",
     "webpack-assets-manifest": "^4.0.6",
     "webpack-bundle-analyzer": "^4.8.0",
diff --git a/yarn.lock b/yarn.lock
index c5d0480061..86640faa05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2910,6 +2910,7 @@ __metadata:
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
     typescript: "npm:^5.0.4"
+    use-debounce: "npm:^10.0.0"
     webpack: "npm:^4.47.0"
     webpack-assets-manifest: "npm:^4.0.6"
     webpack-bundle-analyzer: "npm:^4.8.0"
@@ -17543,6 +17544,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-debounce@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "use-debounce@npm:10.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+  checksum: 10c0/c1166cba52dedeab17e3e29275af89c57a3e8981b75f6e38ae2896ac36ecd4ed7d8fff5f882ba4b2f91eac7510d5ae0dd89fa4f7d081622ed436c3c89eda5cd1
+  languageName: node
+  linkType: hard
+
 "use-isomorphic-layout-effect@npm:^1.1.1, use-isomorphic-layout-effect@npm:^1.1.2":
   version: 1.1.2
   resolution: "use-isomorphic-layout-effect@npm:1.1.2"

From 6e47637dd4f93169ec783c01f4f9b4dfb7cb66ce Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 18 Jul 2024 17:23:40 +0200
Subject: [PATCH 07/11] Fix grouping across hourly buckets happening in a 12
 seconds window instead of 12 hours window (#31062)

---
 app/services/notify_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index acbb3fc784..23f92c816b 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -217,7 +217,7 @@ class NotifyService < BaseService
     hour_bucket = previous_bucket if hour_bucket < previous_bucket + MAXIMUM_GROUP_SPAN_HOURS
 
     # We do not concern ourselves with race conditions since we use hour buckets
-    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS)
+    redis.set(redis_key, hour_bucket, ex: MAXIMUM_GROUP_SPAN_HOURS.hours.to_i)
 
     "#{type_prefix}-#{hour_bucket}"
   end

From 41b7281b56ea64b13fdf07d5ce7efadcbe65bd1c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:23:43 +0200
Subject: [PATCH 08/11] fix(deps): update dependency use-debounce to v10.0.1
 (#31060)

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 86640faa05..1a17c5862f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17545,11 +17545,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "use-debounce@npm:10.0.0"
+  version: 10.0.1
+  resolution: "use-debounce@npm:10.0.1"
   peerDependencies:
     react: ">=16.8.0"
-  checksum: 10c0/c1166cba52dedeab17e3e29275af89c57a3e8981b75f6e38ae2896ac36ecd4ed7d8fff5f882ba4b2f91eac7510d5ae0dd89fa4f7d081622ed436c3c89eda5cd1
+  checksum: 10c0/377a11814a708f5c392f465cbbe2d119a8a2635c8226cc5e30eba397c4436f8e8234385d069467b369d105ed0d3be733c6a08d8ae1004017c6d6f58f4d4c24d8
   languageName: node
   linkType: hard
 

From 848b59c8ae366895eb690a062698bd8f653e5959 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 11:23:46 -0400
Subject: [PATCH 09/11] Reduce factory creation in `MediaAttachment` model spec
 (#31058)

---
 spec/models/media_attachment_spec.rb | 99 +++++++++++++++++-----------
 spec/rails_helper.rb                 |  1 +
 2 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 24e8ca39c1..3142b291fb 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -90,7 +90,7 @@ RSpec.describe MediaAttachment, :attachment_processing do
       media.destroy
     end
 
-    it 'saves media attachment with correct file metadata' do
+    it 'saves media attachment with correct file and size metadata' do
       expect(media)
         .to be_persisted
         .and be_processing_complete
@@ -103,14 +103,12 @@ RSpec.describe MediaAttachment, :attachment_processing do
 
       # Rack::Mime (used by PublicFileServerMiddleware) recognizes file extension
       expect(Rack::Mime.mime_type(extension, nil)).to eq content_type
-    end
 
-    it 'saves media attachment with correct size metadata' do
-      # strips original file name
+      # Strip original file name
       expect(media.file_file_name)
         .to_not start_with '600x400'
 
-      # sets meta for original and thumbnail
+      # Set meta for original and thumbnail
       expect(media.file.meta.deep_symbolize_keys)
         .to include(
           original: include(
@@ -174,10 +172,18 @@ RSpec.describe MediaAttachment, :attachment_processing do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('avatar.gif')) }
 
     it 'sets correct file metadata' do
-      expect(media.type).to eq 'gifv'
-      expect(media.file_content_type).to eq 'video/mp4'
-      expect(media.file.meta['original']['width']).to eq 128
-      expect(media.file.meta['original']['height']).to eq 128
+      expect(media)
+        .to have_attributes(
+          type: eq('gifv'),
+          file_content_type: eq('video/mp4')
+        )
+      expect(media_metadata)
+        .to include(
+          original: include(
+            width: eq(128),
+            height: eq(128)
+          )
+        )
     end
   end
 
@@ -192,11 +198,19 @@ RSpec.describe MediaAttachment, :attachment_processing do
         let(:media) { Fabricate(:media_attachment, file: attachment_fixture(fixture[:filename])) }
 
         it 'sets correct file metadata' do
-          expect(media.type).to eq 'image'
-          expect(media.file_content_type).to eq 'image/gif'
-          expect(media.file.meta['original']['width']).to eq fixture[:width]
-          expect(media.file.meta['original']['height']).to eq fixture[:height]
-          expect(media.file.meta['original']['aspect']).to eq fixture[:aspect]
+          expect(media)
+            .to have_attributes(
+              type: eq('image'),
+              file_content_type: eq('image/gif')
+            )
+          expect(media_metadata)
+            .to include(
+              original: include(
+                width: eq(fixture[:width]),
+                height: eq(fixture[:height]),
+                aspect: eq(fixture[:aspect])
+              )
+            )
         end
       end
     end
@@ -204,39 +218,42 @@ RSpec.describe MediaAttachment, :attachment_processing do
 
   describe 'ogg with cover art' do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.ogg')) }
+    let(:expected_media_duration) { 0.235102 }
+
+    # The libvips and ImageMagick implementations produce different results
+    let(:expected_background_color) { Rails.configuration.x.use_vips ? '#268cd9' : '#3088d4' }
 
     it 'sets correct file metadata' do
-      expect(media.type).to eq 'audio'
-      expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
-      expect(media.thumbnail.present?).to be true
+      expect(media)
+        .to have_attributes(
+          type: eq('audio'),
+          thumbnail: be_present,
+          file_file_name: not_eq('boop.ogg')
+        )
 
-      expect(media.file.meta['colors']['background']).to eq(expected_background_color)
-      expect(media.file_file_name).to_not eq 'boop.ogg'
-    end
-
-    def expected_background_color
-      # The libvips and ImageMagick implementations produce different results
-      Rails.configuration.x.use_vips ? '#268cd9' : '#3088d4'
+      expect(media_metadata)
+        .to include(
+          original: include(duration: be_within(0.05).of(expected_media_duration)),
+          colors: include(background: eq(expected_background_color))
+        )
     end
   end
 
   describe 'mp3 with large cover art' do
     let(:media) { Fabricate(:media_attachment, file: attachment_fixture('boop.mp3')) }
+    let(:expected_media_duration) { 0.235102 }
 
-    it 'detects it as an audio file' do
-      expect(media.type).to eq 'audio'
-    end
-
-    it 'sets meta for the duration' do
-      expect(media.file.meta['original']['duration']).to be_within(0.05).of(0.235102)
-    end
-
-    it 'extracts thumbnail' do
-      expect(media.thumbnail.present?).to be true
-    end
-
-    it 'gives the file a random name' do
-      expect(media.file_file_name).to_not eq 'boop.mp3'
+    it 'detects file type and sets correct metadata' do
+      expect(media)
+        .to have_attributes(
+          type: eq('audio'),
+          thumbnail: be_present,
+          file_file_name: not_eq('boop.mp3')
+        )
+      expect(media_metadata)
+        .to include(
+          original: include(duration: be_within(0.05).of(expected_media_duration))
+        )
     end
   end
 
@@ -274,4 +291,10 @@ RSpec.describe MediaAttachment, :attachment_processing do
       expect(media.valid?).to be true
     end
   end
+
+  private
+
+  def media_metadata
+    media.file.meta.deep_symbolize_keys
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 79031f1a94..d4b9bddf93 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -161,6 +161,7 @@ RSpec::Sidekiq.configure do |config|
 end
 
 RSpec::Matchers.define_negated_matcher :not_change, :change
+RSpec::Matchers.define_negated_matcher :not_eq, :eq
 RSpec::Matchers.define_negated_matcher :not_include, :include
 
 def request_fixture(name)

From 82344342c1c5adb3f6a4b376559db737a9e982b7 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 11:45:40 -0400
Subject: [PATCH 10/11] Add link to org-level contribution guidelines to
 contributing doc (#31043)

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b68a9bde3e..8286fdd2f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,11 @@ You can contribute in the following ways:
 
 If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
 
+Please review the org-level [contribution guidelines] for high-level acceptance
+criteria guidance.
+
+[contribution guidelines]: https://github.com/mastodon/.github/blob/main/CONTRIBUTING.md
+
 ## API Changes and Additions
 
 Please note that any changes or additions made to the API should have an accompanying pull request on [our documentation repository](https://github.com/mastodon/documentation).

From 7224e2405413b816b2fbc171a9a9e7b86bae0261 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 18 Jul 2024 16:36:09 +0200
Subject: [PATCH 11/11] [Glitch] Grouped Notifications UI

Port f587ff643f552a32a1c43e103a474a5065cd3657 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 app/javascript/flavours/glitch/actions/app.ts |   3 +
 .../flavours/glitch/actions/markers.ts        |  14 +-
 .../glitch/actions/notification_groups.ts     | 144 +++++
 .../flavours/glitch/actions/notifications.js  |  13 +-
 .../actions/notifications_migration.tsx       |  18 +
 .../glitch/actions/notifications_typed.ts     |   9 +-
 .../flavours/glitch/actions/streaming.js      |  11 +-
 .../flavours/glitch/api/notifications.ts      |  18 +
 .../glitch/api_types/notifications.ts         | 145 +++++
 .../flavours/glitch/api_types/reports.ts      |  16 +
 .../flavours/glitch/components/load_gap.tsx   |  12 +-
 .../flavours/glitch/components/status.jsx     |  16 +-
 .../glitch/components/status_header.jsx       |   4 +-
 .../glitch/components/status_list.jsx         |   2 +-
 .../glitch/components/status_prepend.jsx      |   2 +-
 .../compose/components/edit_indicator.jsx     |  10 +-
 .../compose/components/reply_indicator.jsx    |  10 +-
 .../components/column_settings.jsx            |  11 +
 .../filtered_notifications_banner.tsx         |   4 +-
 .../components/moderation_warning.tsx         |  51 +-
 .../relationships_severance_event.jsx         |  15 +-
 .../containers/column_settings_container.js   |   8 +-
 .../glitch/features/notifications/index.jsx   |   2 +-
 .../components/avatar_group.tsx               |  31 ++
 .../components/embedded_status.tsx            |  93 ++++
 .../components/embedded_status_content.tsx    | 165 ++++++
 .../components/names_list.tsx                 |  51 ++
 .../components/notification_admin_report.tsx  | 132 +++++
 .../components/notification_admin_sign_up.tsx |  31 ++
 .../components/notification_favourite.tsx     |  45 ++
 .../components/notification_follow.tsx        |  31 ++
 .../notification_follow_request.tsx           |  78 +++
 .../components/notification_group.tsx         | 134 +++++
 .../notification_group_with_status.tsx        |  91 ++++
 .../components/notification_mention.tsx       |  55 ++
 .../notification_moderation_warning.tsx       |  13 +
 .../components/notification_poll.tsx          |  41 ++
 .../components/notification_reblog.tsx        |  45 ++
 .../notification_severed_relationships.tsx    |  15 +
 .../components/notification_status.tsx        |  31 ++
 .../components/notification_update.tsx        |  31 ++
 .../components/notification_with_status.tsx   |  73 +++
 .../features/notifications_v2/filter_bar.tsx  | 145 +++++
 .../features/notifications_v2/index.tsx       | 354 ++++++++++++
 .../glitch/features/notifications_wrapper.jsx |  13 +
 .../features/ui/components/columns_area.jsx   |   4 +-
 .../ui/components/navigation_panel.jsx        |   9 +-
 .../flavours/glitch/features/ui/index.jsx     |  15 +-
 .../features/ui/util/async-components.js      |  10 +-
 .../glitch/models/notification_group.ts       | 207 +++++++
 .../flavours/glitch/reducers/index.ts         |   2 +
 .../flavours/glitch/reducers/markers.ts       |  25 +-
 .../glitch/reducers/notification_groups.ts    | 508 ++++++++++++++++++
 .../flavours/glitch/reducers/notifications.js |   4 +-
 .../glitch/selectors/notifications.ts         |  34 ++
 .../flavours/glitch/selectors/settings.ts     |  40 ++
 .../flavours/glitch/styles/components.scss    | 295 +++++++++-
 57 files changed, 3271 insertions(+), 118 deletions(-)
 create mode 100644 app/javascript/flavours/glitch/actions/notification_groups.ts
 create mode 100644 app/javascript/flavours/glitch/actions/notifications_migration.tsx
 create mode 100644 app/javascript/flavours/glitch/api/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/api_types/reports.ts
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_v2/index.tsx
 create mode 100644 app/javascript/flavours/glitch/features/notifications_wrapper.jsx
 create mode 100644 app/javascript/flavours/glitch/models/notification_group.ts
 create mode 100644 app/javascript/flavours/glitch/reducers/notification_groups.ts
 create mode 100644 app/javascript/flavours/glitch/selectors/notifications.ts
 create mode 100644 app/javascript/flavours/glitch/selectors/settings.ts

diff --git a/app/javascript/flavours/glitch/actions/app.ts b/app/javascript/flavours/glitch/actions/app.ts
index 6fbfc07f68..be1a5cced2 100644
--- a/app/javascript/flavours/glitch/actions/app.ts
+++ b/app/javascript/flavours/glitch/actions/app.ts
@@ -2,6 +2,9 @@ import { createAction } from '@reduxjs/toolkit';
 
 import type { LayoutType } from '../is_mobile';
 
+export const focusApp = createAction('APP_FOCUS');
+export const unfocusApp = createAction('APP_UNFOCUS');
+
 interface ChangeLayoutPayload {
   layout: LayoutType;
 }
diff --git a/app/javascript/flavours/glitch/actions/markers.ts b/app/javascript/flavours/glitch/actions/markers.ts
index a85af1c4be..861eae41ec 100644
--- a/app/javascript/flavours/glitch/actions/markers.ts
+++ b/app/javascript/flavours/glitch/actions/markers.ts
@@ -75,9 +75,17 @@ interface MarkerParam {
 }
 
 function getLastNotificationId(state: RootState): string | undefined {
-  // @ts-expect-error state.notifications is not yet typed
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
-  return state.getIn(['notifications', 'lastReadId']);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+  const enableBeta = state.settings.getIn(
+    ['notifications', 'groupingBeta'],
+    false,
+  ) as boolean;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return enableBeta
+    ? 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']);
 }
 
 const buildPostMarkersParams = (state: RootState) => {
diff --git a/app/javascript/flavours/glitch/actions/notification_groups.ts b/app/javascript/flavours/glitch/actions/notification_groups.ts
new file mode 100644
index 0000000000..3f6d14a978
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notification_groups.ts
@@ -0,0 +1,144 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import {
+  apiClearNotifications,
+  apiFetchNotifications,
+} 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 { allNotificationTypes } from 'flavours/glitch/api_types/notifications';
+import type { ApiStatusJSON } from 'flavours/glitch/api_types/statuses';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
+import {
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+} from 'flavours/glitch/selectors/settings';
+import type { AppDispatch } from 'flavours/glitch/store';
+import {
+  createAppAsyncThunk,
+  createDataLoadingThunk,
+} from 'flavours/glitch/store/typed_functions';
+
+import { importFetchedAccounts, importFetchedStatuses } from './importer';
+import { NOTIFICATIONS_FILTER_SET } from './notifications';
+import { saveSettings } from './settings';
+
+function excludeAllTypesExcept(filter: string) {
+  return allNotificationTypes.filter((item) => item !== filter);
+}
+
+function dispatchAssociatedRecords(
+  dispatch: AppDispatch,
+  notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
+) {
+  const fetchedAccounts: ApiAccountJSON[] = [];
+  const fetchedStatuses: ApiStatusJSON[] = [];
+
+  notifications.forEach((notification) => {
+    if ('sample_accounts' in notification) {
+      fetchedAccounts.push(...notification.sample_accounts);
+    }
+
+    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) {
+      fetchedStatuses.push(notification.status);
+    }
+  });
+
+  if (fetchedAccounts.length > 0)
+    dispatch(importFetchedAccounts(fetchedAccounts));
+
+  if (fetchedStatuses.length > 0)
+    dispatch(importFetchedStatuses(fetchedStatuses));
+}
+
+export const fetchNotifications = createDataLoadingThunk(
+  'notificationGroups/fetch',
+  async (_params, { getState }) => {
+    const activeFilter =
+      selectSettingsNotificationsQuickFilterActive(getState());
+
+    return apiFetchNotifications({
+      exclude_types:
+        activeFilter === 'all'
+          ? selectSettingsNotificationsExcludedTypes(getState())
+          : excludeAllTypesExcept(activeFilter),
+    });
+  },
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+    const payload: (ApiNotificationGroupJSON | NotificationGap)[] =
+      notifications;
+
+    // TODO: might be worth not using gaps for that…
+    // if (nextLink) payload.push({ type: 'gap', loadUrl: nextLink.uri });
+    if (notifications.length > 1)
+      payload.push({ type: 'gap', maxId: notifications.at(-1)?.page_min_id });
+
+    return payload;
+    // dispatch(submitMarkers());
+  },
+);
+
+export const fetchNotificationsGap = createDataLoadingThunk(
+  'notificationGroups/fetchGap',
+  async (params: { gap: NotificationGap }) =>
+    apiFetchNotifications({ max_id: params.gap.maxId }),
+
+  ({ notifications }, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, notifications);
+
+    return { notifications };
+  },
+);
+
+export const processNewNotificationForGroups = createAppAsyncThunk(
+  'notificationGroups/processNew',
+  (notification: ApiNotificationJSON, { dispatch }) => {
+    dispatchAssociatedRecords(dispatch, [notification]);
+
+    return notification;
+  },
+);
+
+export const loadPending = createAction('notificationGroups/loadPending');
+
+export const updateScrollPosition = createAction<{ top: boolean }>(
+  'notificationGroups/updateScrollPosition',
+);
+
+export const setNotificationsFilter = createAppAsyncThunk(
+  'notifications/filter/set',
+  ({ filterType }: { filterType: string }, { dispatch }) => {
+    dispatch({
+      type: NOTIFICATIONS_FILTER_SET,
+      path: ['notifications', 'quickFilter', 'active'],
+      value: filterType,
+    });
+    // dispatch(expandNotifications({ forceLoad: true }));
+    void dispatch(fetchNotifications());
+    dispatch(saveSettings());
+  },
+);
+
+export const clearNotifications = createDataLoadingThunk(
+  'notifications/clear',
+  () => apiClearNotifications(),
+);
+
+export const markNotificationsAsRead = createAction(
+  'notificationGroups/markAsRead',
+);
+
+export const mountNotifications = createAction('notificationGroups/mount');
+export const unmountNotifications = createAction('notificationGroups/unmount');
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 3a1af501c8..7a97e71bdd 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -43,7 +43,6 @@ export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 
 export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
 
-export const NOTIFICATIONS_CLEAR        = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP   = 'NOTIFICATIONS_SCROLL_TOP';
 export const NOTIFICATIONS_LOAD_PENDING = 'NOTIFICATIONS_LOAD_PENDING';
 
@@ -186,7 +185,7 @@ const noOp = () => {};
 
 let expandNotificationsController = new AbortController();
 
-export function expandNotifications({ maxId, forceLoad } = {}, done = noOp) {
+export function expandNotifications({ maxId, forceLoad = false } = {}, done = noOp) {
   return (dispatch, getState) => {
     const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
@@ -269,16 +268,6 @@ export function expandNotificationsFail(error, isLoadingMore) {
   };
 }
 
-export function clearNotifications() {
-  return (dispatch) => {
-    dispatch({
-      type: NOTIFICATIONS_CLEAR,
-    });
-
-    api().post('/api/v1/notifications/clear');
-  };
-}
-
 export function scrollTopNotifications(top) {
   return {
     type: NOTIFICATIONS_SCROLL_TOP,
diff --git a/app/javascript/flavours/glitch/actions/notifications_migration.tsx b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
new file mode 100644
index 0000000000..32844d4b42
--- /dev/null
+++ b/app/javascript/flavours/glitch/actions/notifications_migration.tsx
@@ -0,0 +1,18 @@
+import { createAppAsyncThunk } from 'flavours/glitch/store';
+
+import { fetchNotifications } from './notification_groups';
+import { expandNotifications } from './notifications';
+
+export const initializeNotifications = createAppAsyncThunk(
+  'notifications/initialize',
+  (_, { dispatch, getState }) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const enableBeta = getState().settings.getIn(
+      ['notifications', 'groupingBeta'],
+      false,
+    ) as boolean;
+
+    if (enableBeta) void dispatch(fetchNotifications());
+    else dispatch(expandNotifications());
+  },
+);
diff --git a/app/javascript/flavours/glitch/actions/notifications_typed.ts b/app/javascript/flavours/glitch/actions/notifications_typed.ts
index 176362f4b1..55896f4c37 100644
--- a/app/javascript/flavours/glitch/actions/notifications_typed.ts
+++ b/app/javascript/flavours/glitch/actions/notifications_typed.ts
@@ -1,11 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import type { ApiAccountJSON } from '../api_types/accounts';
-// To be replaced once ApiNotificationJSON type exists
-interface FakeApiNotificationJSON {
-  type: string;
-  account: ApiAccountJSON;
-}
+import type { ApiNotificationJSON } from 'flavours/glitch/api_types/notifications';
 
 export const notificationsUpdate = createAction(
   'notifications/update',
@@ -13,7 +8,7 @@ export const notificationsUpdate = createAction(
     playSound,
     ...args
   }: {
-    notification: FakeApiNotificationJSON;
+    notification: ApiNotificationJSON;
     usePendingItems: boolean;
     playSound: boolean;
   }) => ({
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index a55240646f..7b006c1be7 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -10,6 +10,7 @@ import {
   deleteAnnouncement,
 } from './announcements';
 import { updateConversations } from './conversations';
+import { processNewNotificationForGroups } from './notification_groups';
 import { updateNotifications, expandNotifications } from './notifications';
 import { updateStatus } from './statuses';
 import {
@@ -98,10 +99,16 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
           break;
-        case 'notification':
+        case 'notification': {
           // @ts-expect-error
-          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
+          const notificationJSON = JSON.parse(data.payload);
+          dispatch(updateNotifications(notificationJSON, messages, locale));
+          // TODO: remove this once the groups feature replaces the previous one
+          if(getState().notificationGroups.groups.length > 0) {
+            dispatch(processNewNotificationForGroups(notificationJSON));
+          }
           break;
+        }
         case 'conversation':
           // @ts-expect-error
           dispatch(updateConversations(JSON.parse(data.payload)));
diff --git a/app/javascript/flavours/glitch/api/notifications.ts b/app/javascript/flavours/glitch/api/notifications.ts
new file mode 100644
index 0000000000..fe71878822
--- /dev/null
+++ b/app/javascript/flavours/glitch/api/notifications.ts
@@ -0,0 +1,18 @@
+import api, { apiRequest, getLinks } from 'flavours/glitch/api';
+import type { ApiNotificationGroupJSON } from 'flavours/glitch/api_types/notifications';
+
+export const apiFetchNotifications = async (params?: {
+  exclude_types?: string[];
+  max_id?: string;
+}) => {
+  const response = await api().request<ApiNotificationGroupJSON[]>({
+    method: 'GET',
+    url: '/api/v2_alpha/notifications',
+    params,
+  });
+
+  return { notifications: response.data, links: getLinks(response) };
+};
+
+export const apiClearNotifications = () =>
+  apiRequest<undefined>('POST', 'v1/notifications/clear');
diff --git a/app/javascript/flavours/glitch/api_types/notifications.ts b/app/javascript/flavours/glitch/api_types/notifications.ts
new file mode 100644
index 0000000000..ea37556d8d
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/notifications.ts
@@ -0,0 +1,145 @@
+// See app/serializers/rest/notification_group_serializer.rb
+
+import type { AccountWarningAction } from 'flavours/glitch/models/notification_group';
+
+import type { ApiAccountJSON } from './accounts';
+import type { ApiReportJSON } from './reports';
+import type { ApiStatusJSON } from './statuses';
+
+// See app/model/notification.rb
+export const allNotificationTypes = [
+  'follow',
+  'follow_request',
+  'favourite',
+  'reblog',
+  'mention',
+  'poll',
+  'status',
+  'update',
+  'admin.sign_up',
+  'admin.report',
+  'moderation_warning',
+  'severed_relationships',
+];
+
+export type NotificationWithStatusType =
+  | 'favourite'
+  | 'reblog'
+  | 'status'
+  | 'mention'
+  | 'poll'
+  | 'update';
+
+export type NotificationType =
+  | NotificationWithStatusType
+  | 'follow'
+  | 'follow_request'
+  | 'moderation_warning'
+  | 'severed_relationships'
+  | 'admin.sign_up'
+  | 'admin.report';
+
+export interface BaseNotificationJSON {
+  id: string;
+  type: NotificationType;
+  created_at: string;
+  group_key: string;
+  account: ApiAccountJSON;
+}
+
+export interface BaseNotificationGroupJSON {
+  group_key: string;
+  notifications_count: number;
+  type: NotificationType;
+  sample_accounts: ApiAccountJSON[];
+  latest_page_notification_at: string; // FIXME: This will only be present if the notification group is returned in a paginated list, not requested directly
+  most_recent_notification_id: string;
+  page_min_id?: string;
+  page_max_id?: string;
+}
+
+interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface NotificationWithStatusJSON extends BaseNotificationJSON {
+  type: NotificationWithStatusType;
+  status: ApiStatusJSON;
+}
+
+interface ReportNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+interface ReportNotificationJSON extends BaseNotificationJSON {
+  type: 'admin.report';
+  report: ApiReportJSON;
+}
+
+type SimpleNotificationTypes = 'follow' | 'follow_request' | 'admin.sign_up';
+interface SimpleNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: SimpleNotificationTypes;
+}
+
+interface SimpleNotificationJSON extends BaseNotificationJSON {
+  type: SimpleNotificationTypes;
+}
+
+export interface ApiAccountWarningJSON {
+  id: string;
+  action: AccountWarningAction;
+  text: string;
+  status_ids: string[];
+  created_at: string;
+  target_account: ApiAccountJSON;
+  appeal: unknown;
+}
+
+interface ModerationWarningNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+interface ModerationWarningNotificationJSON extends BaseNotificationJSON {
+  type: 'moderation_warning';
+  moderation_warning: ApiAccountWarningJSON;
+}
+
+export interface ApiAccountRelationshipSeveranceEventJSON {
+  id: string;
+  type: 'account_suspension' | 'domain_block' | 'user_domain_block';
+  purged: boolean;
+  target_name: string;
+  followers_count: number;
+  following_count: number;
+  created_at: string;
+}
+
+interface AccountRelationshipSeveranceNotificationGroupJSON
+  extends BaseNotificationGroupJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+interface AccountRelationshipSeveranceNotificationJSON
+  extends BaseNotificationJSON {
+  type: 'severed_relationships';
+  event: ApiAccountRelationshipSeveranceEventJSON;
+}
+
+export type ApiNotificationJSON =
+  | SimpleNotificationJSON
+  | ReportNotificationJSON
+  | AccountRelationshipSeveranceNotificationJSON
+  | NotificationWithStatusJSON
+  | ModerationWarningNotificationJSON;
+
+export type ApiNotificationGroupJSON =
+  | SimpleNotificationGroupJSON
+  | ReportNotificationGroupJSON
+  | AccountRelationshipSeveranceNotificationGroupJSON
+  | NotificationGroupWithStatusJSON
+  | ModerationWarningNotificationGroupJSON;
diff --git a/app/javascript/flavours/glitch/api_types/reports.ts b/app/javascript/flavours/glitch/api_types/reports.ts
new file mode 100644
index 0000000000..b11cfdd2eb
--- /dev/null
+++ b/app/javascript/flavours/glitch/api_types/reports.ts
@@ -0,0 +1,16 @@
+import type { ApiAccountJSON } from './accounts';
+
+export type ReportCategory = 'other' | 'spam' | 'legal' | 'violation';
+
+export interface ApiReportJSON {
+  id: string;
+  action_taken: unknown;
+  action_taken_at: unknown;
+  category: ReportCategory;
+  comment: string;
+  forwarded: boolean;
+  created_at: string;
+  status_ids: string[];
+  rule_ids: string[];
+  target_account: ApiAccountJSON;
+}
diff --git a/app/javascript/flavours/glitch/components/load_gap.tsx b/app/javascript/flavours/glitch/components/load_gap.tsx
index f0d15d3776..1870185c29 100644
--- a/app/javascript/flavours/glitch/components/load_gap.tsx
+++ b/app/javascript/flavours/glitch/components/load_gap.tsx
@@ -9,18 +9,18 @@ const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });
 
-interface Props {
+interface Props<T> {
   disabled: boolean;
-  maxId: string;
-  onClick: (maxId: string) => void;
+  param: T;
+  onClick: (params: T) => void;
 }
 
-export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+export const LoadGap = <T,>({ disabled, param, onClick }: Props<T>) => {
   const intl = useIntl();
 
   const handleClick = useCallback(() => {
-    onClick(maxId);
-  }, [maxId, onClick]);
+    onClick(param);
+  }, [param, onClick]);
 
   return (
     <button
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 0915af2004..c115251d65 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -115,6 +115,8 @@ class Status extends ImmutablePureComponent {
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
     scrollKey: PropTypes.string,
+    skipPrepend: PropTypes.bool,
+    avatarSize: PropTypes.number,
     deployPictureInPicture: PropTypes.func,
     settings: ImmutablePropTypes.map.isRequired,
     pictureInPicture: ImmutablePropTypes.contains({
@@ -518,12 +520,14 @@ class Status extends ImmutablePureComponent {
   }
 
   render () {
+    const { intl, hidden, featured, unread, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend, avatarSize = 46 } = this.props;
+
     const {
       parseClick,
       setCollapsed,
     } = this;
+
     const {
-      intl,
       status,
       account,
       settings,
@@ -533,13 +537,6 @@ class Status extends ImmutablePureComponent {
       onOpenVideo,
       onOpenMedia,
       notification,
-      hidden,
-      unread,
-      featured,
-      pictureInPicture,
-      previousId,
-      nextInReplyToId,
-      rootId,
       history,
       ...other
     } = this.props;
@@ -799,7 +796,7 @@ class Status extends ImmutablePureComponent {
           ref={this.handleRef}
           data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}
         >
-          {prepend}
+          {!skipPrepend && prepend}
 
           <div
             className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted, 'has-background': isCollapsed && background })}
@@ -815,6 +812,7 @@ class Status extends ImmutablePureComponent {
                   friend={account}
                   collapsed={isCollapsed}
                   parseClick={parseClick}
+                  avatarSize={avatarSize}
                 />
                 <StatusIcons
                   status={status}
diff --git a/app/javascript/flavours/glitch/components/status_header.jsx b/app/javascript/flavours/glitch/components/status_header.jsx
index 2dd09d68ef..5eeed3d41d 100644
--- a/app/javascript/flavours/glitch/components/status_header.jsx
+++ b/app/javascript/flavours/glitch/components/status_header.jsx
@@ -14,6 +14,7 @@ export default class StatusHeader extends PureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
     friend: ImmutablePropTypes.map,
+    avatarSize: PropTypes.number,
     parseClick: PropTypes.func.isRequired,
   };
 
@@ -33,13 +34,14 @@ export default class StatusHeader extends PureComponent {
     const {
       status,
       friend,
+      avatarSize,
     } = this.props;
 
     const account = status.get('account');
 
     let statusAvatar;
     if (friend === undefined || friend === null) {
-      statusAvatar = <Avatar account={account} size={46} />;
+      statusAvatar = <Avatar account={account} size={avatarSize} />;
     } else {
       statusAvatar = <AvatarOverlay account={account} friend={friend} />;
     }
diff --git a/app/javascript/flavours/glitch/components/status_list.jsx b/app/javascript/flavours/glitch/components/status_list.jsx
index 374d14a56a..b0295a504d 100644
--- a/app/javascript/flavours/glitch/components/status_list.jsx
+++ b/app/javascript/flavours/glitch/components/status_list.jsx
@@ -108,7 +108,7 @@ export default class StatusList extends ImmutablePureComponent {
             <LoadGap
               key={'gap:' + statusIds.get(index + 1)}
               disabled={isLoading}
-              maxId={index > 0 ? statusIds.get(index - 1) : null}
+              param={index > 0 ? statusIds.get(index - 1) : null}
               onClick={onLoadMore}
             />
           );
diff --git a/app/javascript/flavours/glitch/components/status_prepend.jsx b/app/javascript/flavours/glitch/components/status_prepend.jsx
index e3bb554e2a..0777ffcda6 100644
--- a/app/javascript/flavours/glitch/components/status_prepend.jsx
+++ b/app/javascript/flavours/glitch/components/status_prepend.jsx
@@ -98,7 +98,7 @@ export default class StatusPrepend extends PureComponent {
         return (
           <FormattedMessage
             id='notification.poll'
-            defaultMessage='A poll you have voted in has ended'
+            defaultMessage='A poll you voted in has ended'
           />
         );
       }
diff --git a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
index 060e760f06..bccb716dae 100644
--- a/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/edit_indicator.jsx
@@ -12,6 +12,7 @@ import { Icon } from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { Permalink } from 'flavours/glitch/components/permalink';
 import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+import { EmbeddedStatusContent } from 'flavours/glitch/features/notifications_v2/components/embedded_status_content';
 
 const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
@@ -32,8 +33,6 @@ export const EditIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='edit-indicator'>
       <div className='edit-indicator__header'>
@@ -48,7 +47,12 @@ export const EditIndicator = () => {
         </div>
       </div>
 
-      <div className='edit-indicator__content translate' dangerouslySetInnerHTML={content} />
+      <EmbeddedStatusContent
+        className='edit-indicator__content translate'
+        content={status.get('contentHtml')}
+        language={status.get('language')}
+        mentions={status.get('mentions')}
+      />
 
       {(status.get('poll') || status.get('media_attachments').size > 0) && (
         <div className='edit-indicator__attachments'>
diff --git a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
index b24f7ced99..adb8f457ed 100644
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@@ -8,6 +8,7 @@ import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
 import { Icon } from 'flavours/glitch/components/icon';
 import { Permalink } from 'flavours/glitch/components/permalink';
+import { EmbeddedStatusContent } from 'flavours/glitch/features/notifications_v2/components/embedded_status_content';
 
 export const ReplyIndicator = () => {
   const inReplyToId = useSelector(state => state.getIn(['compose', 'in_reply_to']));
@@ -18,8 +19,6 @@ export const ReplyIndicator = () => {
     return null;
   }
 
-  const content = { __html: status.get('contentHtml') };
-
   return (
     <div className='reply-indicator'>
       <div className='reply-indicator__line' />
@@ -33,7 +32,12 @@ export const ReplyIndicator = () => {
           <DisplayName account={account} />
         </Permalink>
 
-        <div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />
+        <EmbeddedStatusContent
+          className='reply-indicator__content translate'
+          content={status.get('contentHtml')}
+          language={status.get('language')}
+          mentions={status.get('mentions')}
+        />
 
         {(status.get('poll') || status.get('media_attachments').size > 0) && (
           <div className='reply-indicator__attachments'>
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 1ed7797509..3423517227 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
@@ -53,6 +53,7 @@ class ColumnSettings extends PureComponent {
     const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission, notificationPolicy } = 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' />;
@@ -115,6 +116,16 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <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/components/filtered_notifications_banner.tsx b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
index 70762be0e3..2be6ac8466 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/filtered_notifications_banner.tsx
@@ -35,7 +35,9 @@ export const FilteredNotificationsBanner: React.FC = () => {
       className='filtered-notifications-banner'
       to='/notifications/requests'
     >
-      <Icon icon={InventoryIcon} id='filtered-notifications' />
+      <div className='notification-group__icon'>
+        <Icon icon={InventoryIcon} id='filtered-notifications' />
+      </div>
 
       <div className='filtered-notifications-banner__text'>
         <strong>
diff --git a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
index 2fd19c5108..16eac6ded5 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/moderation_warning.tsx
@@ -1,7 +1,10 @@
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import GavelIcon from '@/material-icons/400-24px/gavel.svg?react';
 import { Icon } from 'flavours/glitch/components/icon';
+import type { AccountWarningAction } from 'flavours/glitch/models/notification_group';
 
 // This needs to be kept in sync with app/models/account_warning.rb
 const messages = defineMessages({
@@ -36,19 +39,18 @@ const messages = defineMessages({
 });
 
 interface Props {
-  action:
-    | 'none'
-    | 'disable'
-    | 'mark_statuses_as_sensitive'
-    | 'delete_statuses'
-    | 'sensitive'
-    | 'silence'
-    | 'suspend';
+  action: AccountWarningAction;
   id: string;
-  hidden: boolean;
+  hidden?: boolean;
+  unread?: boolean;
 }
 
-export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
+export const ModerationWarning: React.FC<Props> = ({
+  action,
+  id,
+  hidden,
+  unread,
+}) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -56,23 +58,32 @@ export const ModerationWarning: React.FC<Props> = ({ action, id, hidden }) => {
   }
 
   return (
-    <a
-      href={`/disputes/strikes/${id}`}
-      target='_blank'
-      rel='noopener noreferrer'
-      className='notification__moderation-warning'
+    <div
+      role='button'
+      className={classNames(
+        'notification-group notification-group--link notification-group--moderation-warning focusable',
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
     >
-      <Icon id='warning' icon={GavelIcon} />
+      <div className='notification-group__icon'>
+        <Icon id='warning' icon={GavelIcon} />
+      </div>
 
-      <div className='notification__moderation-warning__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[action])}</p>
-        <span className='link-button'>
+        <a
+          href={`/disputes/strikes/${id}`}
+          target='_blank'
+          rel='noopener noreferrer'
+          className='link-button'
+        >
           <FormattedMessage
             id='notification.moderation-warning.learn_more'
             defaultMessage='Learn more'
           />
-        </span>
+        </a>
       </div>
-    </a>
+    </div>
   );
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
index 05cee6aaa1..397a2b7558 100644
--- a/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/components/relationships_severance_event.jsx
@@ -2,6 +2,8 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import classNames from 'classnames';
+
 import HeartBrokenIcon from '@/material-icons/400-24px/heart_broken-fill.svg?react';
 import { Icon }  from 'flavours/glitch/components/icon';
 import { domain } from 'flavours/glitch/initial_state';
@@ -13,7 +15,7 @@ const messages = defineMessages({
   user_domain_block: { id: 'notification.relationships_severance_event.user_domain_block', defaultMessage: 'You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.' },
 });
 
-export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden }) => {
+export const RelationshipsSeveranceEvent = ({ type, target, followingCount, followersCount, hidden, unread }) => {
   const intl = useIntl();
 
   if (hidden) {
@@ -21,14 +23,14 @@ export const RelationshipsSeveranceEvent = ({ type, target, followingCount, foll
   }
 
   return (
-    <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='notification__relationships-severance-event'>
-      <Icon id='heart_broken' icon={HeartBrokenIcon} />
+    <div role='button' className={classNames('notification-group notification-group--link notification-group--relationships-severance-event focusable', { 'notification-group--unread': unread })} tabIndex='0'>
+      <div className='notification-group__icon'><Icon id='heart_broken' icon={HeartBrokenIcon} /></div>
 
-      <div className='notification__relationships-severance-event__content'>
+      <div className='notification-group__main'>
         <p>{intl.formatMessage(messages[type], { from: <strong>{domain}</strong>, target: <strong>{target}</strong>, followingCount, followersCount })}</p>
-        <span className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></span>
+        <a href='/severed_relationships' target='_blank' rel='noopener noreferrer' className='link-button'><FormattedMessage id='notification.relationships_severance_event.learn_more' defaultMessage='Learn more' /></a>
       </div>
-    </a>
+    </div>
   );
 };
 
@@ -42,4 +44,5 @@ RelationshipsSeveranceEvent.propTypes = {
   followersCount: PropTypes.number.isRequired,
   followingCount: PropTypes.number.isRequired,
   hidden: PropTypes.bool,
+  unread: PropTypes.bool,
 };
diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
index 4547fde042..55dcd4226c 100644
--- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js
@@ -2,10 +2,13 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
+
 import { showAlert } from '../../../actions/alerts';
 import { openModal } from '../../../actions/modal';
+import { clearNotifications } from '../../../actions/notification_groups';
 import { updateNotificationsPolicy } from '../../../actions/notification_policies';
-import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
+import { setFilter, requestBrowserPermission } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { changeSetting } from '../../../actions/settings';
 import ColumnSettings from '../components/column_settings';
@@ -58,6 +61,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
       } else {
         dispatch(changeSetting(['notifications', ...path], checked));
       }
+    } else if(path[0] === 'groupingBeta') {
+      dispatch(changeSetting(['notifications', ...path], checked));
+      dispatch(initializeNotifications());
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
diff --git a/app/javascript/flavours/glitch/features/notifications/index.jsx b/app/javascript/flavours/glitch/features/notifications/index.jsx
index bc32f9a7d2..2d3d437756 100644
--- a/app/javascript/flavours/glitch/features/notifications/index.jsx
+++ b/app/javascript/flavours/glitch/features/notifications/index.jsx
@@ -237,7 +237,7 @@ class Notifications extends PureComponent {
         <LoadGap
           key={'gap:' + notifications.getIn([index + 1, 'id'])}
           disabled={isLoading}
-          maxId={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
+          param={index > 0 ? notifications.getIn([index - 1, 'id']) : null}
           onClick={this.handleLoadGap}
         />
       ) : (
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
new file mode 100644
index 0000000000..48f2328bbb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/avatar_group.tsx
@@ -0,0 +1,31 @@
+import { Link } from 'react-router-dom';
+
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+const AvatarWrapper: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) return null;
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <Avatar account={account} size={28} />
+    </Link>
+  );
+};
+
+export const AvatarGroup: React.FC<{ accountIds: string[] }> = ({
+  accountIds,
+}) => (
+  <div className='notification-group__avatar-group'>
+    {accountIds.slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS).map((accountId) => (
+      <AvatarWrapper key={accountId} accountId={accountId} />
+    ))}
+  </div>
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
new file mode 100644
index 0000000000..530f305be7
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status.tsx
@@ -0,0 +1,93 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List as ImmutableList, RecordOf } from 'immutable';
+
+import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
+import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { Avatar } from 'flavours/glitch/components/avatar';
+import { DisplayName } from 'flavours/glitch/components/display_name';
+import { Icon } from 'flavours/glitch/components/icon';
+import type { Status } from 'flavours/glitch/models/status';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { EmbeddedStatusContent } from './embedded_status_content';
+
+export type Mention = RecordOf<{ url: string; acct: string }>;
+
+export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
+  statusId,
+}) => {
+  const history = useHistory();
+
+  const status = useAppSelector(
+    (state) => state.statuses.get(statusId) as Status | undefined,
+  );
+
+  const account = useAppSelector((state) =>
+    state.accounts.get(status?.get('account') as string),
+  );
+
+  const handleClick = useCallback(() => {
+    if (!account) return;
+
+    history.push(`/@${account.acct}/${statusId}`);
+  }, [statusId, account, history]);
+
+  if (!status) {
+    return null;
+  }
+
+  // Assign status attributes to variables with a forced type, as status is not yet properly typed
+  const contentHtml = status.get('contentHtml') as string;
+  const poll = status.get('poll');
+  const language = status.get('language') as string;
+  const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const mediaAttachmentsSize = (
+    status.get('media_attachments') as ImmutableList<unknown>
+  ).size;
+
+  return (
+    <div className='notification-group__embedded-status'>
+      <div className='notification-group__embedded-status__account'>
+        <Avatar account={account} size={16} />
+        <DisplayName account={account} />
+      </div>
+
+      <EmbeddedStatusContent
+        className='notification-group__embedded-status__content reply-indicator__content translate'
+        content={contentHtml}
+        language={language}
+        mentions={mentions}
+        onClick={handleClick}
+      />
+
+      {(poll || mediaAttachmentsSize > 0) && (
+        <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
+          {!!poll && (
+            <>
+              <Icon icon={BarChart4BarsIcon} id='bar-chart-4-bars' />
+              <FormattedMessage
+                id='reply_indicator.poll'
+                defaultMessage='Poll'
+              />
+            </>
+          )}
+          {mediaAttachmentsSize > 0 && (
+            <>
+              <Icon icon={PhotoLibraryIcon} id='photo-library' />
+              <FormattedMessage
+                id='reply_indicator.attachments'
+                defaultMessage='{count, plural, one {# attachment} other {# attachments}}'
+                values={{ count: mediaAttachmentsSize }}
+              />
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
new file mode 100644
index 0000000000..310a685711
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/embedded_status_content.tsx
@@ -0,0 +1,165 @@
+import { useCallback, useRef } from 'react';
+
+import { useHistory } from 'react-router-dom';
+
+import type { List } from 'immutable';
+
+import type { History } from 'history';
+
+import type { Mention } from './embedded_status';
+
+const handleMentionClick = (
+  history: History,
+  mention: Mention,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/@${mention.get('acct')}`);
+  }
+};
+
+const handleHashtagClick = (
+  history: History,
+  hashtag: string,
+  e: MouseEvent,
+) => {
+  if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    e.preventDefault();
+    history.push(`/tags/${hashtag.replace(/^#/, '')}`);
+  }
+};
+
+export const EmbeddedStatusContent: React.FC<{
+  content: string;
+  mentions: List<Mention>;
+  language: string;
+  onClick?: () => void;
+  className?: string;
+}> = ({ content, mentions, language, onClick, className }) => {
+  const clickCoordinatesRef = useRef<[number, number] | null>();
+  const history = useHistory();
+
+  const handleMouseDown = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY }) => {
+      clickCoordinatesRef.current = [clientX, clientY];
+    },
+    [clickCoordinatesRef],
+  );
+
+  const handleMouseUp = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ clientX, clientY, target, button }) => {
+      const [startX, startY] = clickCoordinatesRef.current ?? [0, 0];
+      const [deltaX, deltaY] = [
+        Math.abs(clientX - startX),
+        Math.abs(clientY - startY),
+      ];
+
+      let element: HTMLDivElement | null = target as HTMLDivElement;
+
+      while (element) {
+        if (
+          element.localName === 'button' ||
+          element.localName === 'a' ||
+          element.localName === 'label'
+        ) {
+          return;
+        }
+
+        element = element.parentNode as HTMLDivElement | null;
+      }
+
+      if (deltaX + deltaY < 5 && button === 0 && onClick) {
+        onClick();
+      }
+
+      clickCoordinatesRef.current = null;
+    },
+    [clickCoordinatesRef, onClick],
+  );
+
+  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-original');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
+    ({ currentTarget }) => {
+      const emojis =
+        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
+
+      for (const emoji of emojis) {
+        const newSrc = emoji.getAttribute('data-static');
+        if (newSrc) emoji.src = newSrc;
+      }
+    },
+    [],
+  );
+
+  const handleContentRef = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (!node) {
+        return;
+      }
+
+      const links = node.querySelectorAll<HTMLAnchorElement>('a');
+
+      for (const link of links) {
+        if (link.classList.contains('status-link')) {
+          continue;
+        }
+
+        link.classList.add('status-link');
+
+        const mention = mentions.find((item) => link.href === item.get('url'));
+
+        if (mention) {
+          link.addEventListener(
+            'click',
+            handleMentionClick.bind(null, history, mention),
+            false,
+          );
+          link.setAttribute('title', `@${mention.get('acct')}`);
+          link.setAttribute('href', `/@${mention.get('acct')}`);
+        } else if (
+          link.textContent?.[0] === '#' ||
+          link.previousSibling?.textContent?.endsWith('#')
+        ) {
+          link.addEventListener(
+            'click',
+            handleHashtagClick.bind(null, history, link.text),
+            false,
+          );
+          link.setAttribute('href', `/tags/${link.text.replace(/^#/, '')}`);
+        } else {
+          link.setAttribute('title', link.href);
+          link.classList.add('unhandled-link');
+        }
+      }
+    },
+    [mentions, history],
+  );
+
+  return (
+    <div
+      role='button'
+      tabIndex={0}
+      className={className}
+      ref={handleContentRef}
+      lang={language}
+      dangerouslySetInnerHTML={{ __html: content }}
+      onMouseDown={handleMouseDown}
+      onMouseUp={handleMouseUp}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
new file mode 100644
index 0000000000..a46b584e46
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/names_list.tsx
@@ -0,0 +1,51 @@
+import { FormattedMessage } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const NamesList: React.FC<{
+  accountIds: string[];
+  total: number;
+  seeMoreHref?: string;
+}> = ({ accountIds, total, seeMoreHref }) => {
+  const lastAccountId = accountIds[0] ?? '0';
+  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
+
+  if (!account) return null;
+
+  const displayedName = (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-hover-card-account={account.id}
+    >
+      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+    </Link>
+  );
+
+  if (total === 1) {
+    return displayedName;
+  }
+
+  if (seeMoreHref)
+    return (
+      <FormattedMessage
+        id='name_and_others_with_link'
+        defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a>'
+        values={{
+          name: displayedName,
+          count: total - 1,
+          a: (chunks) => <Link to={seeMoreHref}>{chunks}</Link>,
+        }}
+      />
+    );
+
+  return (
+    <FormattedMessage
+      id='name_and_others'
+      defaultMessage='{name} and {count, plural, one {# other} other {# others}}'
+      values={{ name: displayedName, count: total - 1 }}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
new file mode 100644
index 0000000000..fc2d3149b3
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_report.tsx
@@ -0,0 +1,132 @@
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import classNames from 'classnames';
+
+import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import { Icon } from 'flavours/glitch/components/icon';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+import type { NotificationGroupAdminReport } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+// This needs to be kept in sync with app/models/report.rb
+const messages = defineMessages({
+  other: {
+    id: 'report_notification.categories.other_sentence',
+    defaultMessage: 'other',
+  },
+  spam: {
+    id: 'report_notification.categories.spam_sentence',
+    defaultMessage: 'spam',
+  },
+  legal: {
+    id: 'report_notification.categories.legal_sentence',
+    defaultMessage: 'illegal content',
+  },
+  violation: {
+    id: 'report_notification.categories.violation_sentence',
+    defaultMessage: 'rule violation',
+  },
+});
+
+export const NotificationAdminReport: React.FC<{
+  notification: NotificationGroupAdminReport;
+  unread?: boolean;
+}> = ({ notification, notification: { report }, unread }) => {
+  const intl = useIntl();
+  const targetAccount = useAppSelector((state) =>
+    state.accounts.get(report.targetAccountId),
+  );
+  const account = useAppSelector((state) =>
+    state.accounts.get(notification.sampleAccountIds[0] ?? '0'),
+  );
+
+  if (!account || !targetAccount) return null;
+
+  const values = {
+    name: (
+      <bdi
+        dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }}
+      />
+    ),
+    target: (
+      <bdi
+        dangerouslySetInnerHTML={{
+          __html: targetAccount.get('display_name_html'),
+        }}
+      />
+    ),
+    category: intl.formatMessage(messages[report.category]),
+    count: report.status_ids.length,
+  };
+
+  let message;
+
+  if (report.status_ids.length > 0) {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account_other'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_account'
+          defaultMessage='{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  } else {
+    if (report.category === 'other') {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses_other'
+          defaultMessage='{name} reported {target}'
+          values={values}
+        />
+      );
+    } else {
+      message = (
+        <FormattedMessage
+          id='notification.admin.report_statuses'
+          defaultMessage='{name} reported {target} for {category}'
+          values={values}
+        />
+      );
+    }
+  }
+
+  return (
+    <a
+      href={`/admin/reports/${report.id}`}
+      target='_blank'
+      rel='noopener noreferrer'
+      className={classNames(
+        'notification-group notification-group--link notification-group--admin-report focusable',
+        { 'notification-group--unread': unread },
+      )}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='flag' icon={FlagIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__label'>
+            {message}
+            <RelativeTimestamp timestamp={report.created_at} />
+          </div>
+        </div>
+
+        {report.comment.length > 0 && (
+          <div className='notification-group__embedded-status__content'>
+            “{report.comment}”
+          </div>
+        )}
+      </div>
+    </a>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
new file mode 100644
index 0000000000..8a56b880a8
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_admin_sign_up.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupAdminSignUp } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.admin.sign_up'
+    defaultMessage='{name} signed up'
+    values={values}
+  />
+);
+
+export const NotificationAdminSignUp: React.FC<{
+  notification: NotificationGroupAdminSignUp;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='admin-sign-up'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
new file mode 100644
index 0000000000..8e16a042ce
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_favourite.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
+import type { NotificationGroupFavourite } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.favourite'
+    defaultMessage='{name} favorited your status'
+    values={values}
+  />
+);
+
+export const NotificationFavourite: React.FC<{
+  notification: NotificationGroupFavourite;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='favourite'
+      icon={StarIcon}
+      iconId='star'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/favourites` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
new file mode 100644
index 0000000000..92d28dccbd
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import type { NotificationGroupFollow } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow'
+    defaultMessage='{name} followed you'
+    values={values}
+  />
+);
+
+export const NotificationFollow: React.FC<{
+  notification: NotificationGroupFollow;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationGroupWithStatus
+    type='follow'
+    icon={PersonAddIcon}
+    iconId='person-add'
+    accountIds={notification.sampleAccountIds}
+    timestamp={notification.latest_page_notification_at}
+    count={notification.notifications_count}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
new file mode 100644
index 0000000000..eff233152d
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_follow_request.tsx
@@ -0,0 +1,78 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
+
+import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
+import {
+  authorizeFollowRequest,
+  rejectFollowRequest,
+} from 'flavours/glitch/actions/accounts';
+import { IconButton } from 'flavours/glitch/components/icon_button';
+import type { NotificationGroupFollowRequest } from 'flavours/glitch/models/notification_group';
+import { useAppDispatch } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const messages = defineMessages({
+  authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
+  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
+});
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.follow_request'
+    defaultMessage='{name} has requested to follow you'
+    values={values}
+  />
+);
+
+export const NotificationFollowRequest: React.FC<{
+  notification: NotificationGroupFollowRequest;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const intl = useIntl();
+
+  const dispatch = useAppDispatch();
+
+  const onAuthorize = useCallback(() => {
+    dispatch(authorizeFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const onReject = useCallback(() => {
+    dispatch(rejectFollowRequest(notification.sampleAccountIds[0]));
+  }, [dispatch, notification.sampleAccountIds]);
+
+  const actions = (
+    <div className='notification-group__actions'>
+      <IconButton
+        title={intl.formatMessage(messages.reject)}
+        icon='times'
+        iconComponent={CloseIcon}
+        onClick={onReject}
+      />
+      <IconButton
+        title={intl.formatMessage(messages.authorize)}
+        icon='check'
+        iconComponent={CheckIcon}
+        onClick={onAuthorize}
+      />
+    </div>
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='follow-request'
+      icon={PersonAddIcon}
+      iconId='person-add'
+      accountIds={notification.sampleAccountIds}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      actions={actions}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
new file mode 100644
index 0000000000..b1346a88e0
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group.tsx
@@ -0,0 +1,134 @@
+import { useMemo } from 'react';
+
+import { HotKeys } from 'react-hotkeys';
+
+import type { NotificationGroup as NotificationGroupModel } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { NotificationAdminReport } from './notification_admin_report';
+import { NotificationAdminSignUp } from './notification_admin_sign_up';
+import { NotificationFavourite } from './notification_favourite';
+import { NotificationFollow } from './notification_follow';
+import { NotificationFollowRequest } from './notification_follow_request';
+import { NotificationMention } from './notification_mention';
+import { NotificationModerationWarning } from './notification_moderation_warning';
+import { NotificationPoll } from './notification_poll';
+import { NotificationReblog } from './notification_reblog';
+import { NotificationSeveredRelationships } from './notification_severed_relationships';
+import { NotificationStatus } from './notification_status';
+import { NotificationUpdate } from './notification_update';
+
+export const NotificationGroup: React.FC<{
+  notificationGroupId: NotificationGroupModel['group_key'];
+  unread: boolean;
+  onMoveUp: (groupId: string) => void;
+  onMoveDown: (groupId: string) => void;
+}> = ({ notificationGroupId, unread, onMoveUp, onMoveDown }) => {
+  const notificationGroup = useAppSelector((state) =>
+    state.notificationGroups.groups.find(
+      (item) => item.type !== 'gap' && item.group_key === notificationGroupId,
+    ),
+  );
+
+  const handlers = useMemo(
+    () => ({
+      moveUp: () => {
+        onMoveUp(notificationGroupId);
+      },
+
+      moveDown: () => {
+        onMoveDown(notificationGroupId);
+      },
+    }),
+    [notificationGroupId, onMoveUp, onMoveDown],
+  );
+
+  if (!notificationGroup || notificationGroup.type === 'gap') return null;
+
+  let content;
+
+  switch (notificationGroup.type) {
+    case 'reblog':
+      content = (
+        <NotificationReblog unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'favourite':
+      content = (
+        <NotificationFavourite
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'severed_relationships':
+      content = (
+        <NotificationSeveredRelationships
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'mention':
+      content = (
+        <NotificationMention unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow':
+      content = (
+        <NotificationFollow unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'follow_request':
+      content = (
+        <NotificationFollowRequest
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'poll':
+      content = (
+        <NotificationPoll unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'status':
+      content = (
+        <NotificationStatus unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'update':
+      content = (
+        <NotificationUpdate unread={unread} notification={notificationGroup} />
+      );
+      break;
+    case 'admin.sign_up':
+      content = (
+        <NotificationAdminSignUp
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'admin.report':
+      content = (
+        <NotificationAdminReport
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    case 'moderation_warning':
+      content = (
+        <NotificationModerationWarning
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
+    default:
+      return null;
+  }
+
+  return <HotKeys handlers={handlers}>{content}</HotKeys>;
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
new file mode 100644
index 0000000000..e2466209a8
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_group_with_status.tsx
@@ -0,0 +1,91 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'flavours/glitch/components/icon';
+import { Icon } from 'flavours/glitch/components/icon';
+import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
+
+import { AvatarGroup } from './avatar_group';
+import { EmbeddedStatus } from './embedded_status';
+import { NamesList } from './names_list';
+
+export type LabelRenderer = (
+  values: Record<string, React.ReactNode>,
+) => JSX.Element;
+
+export const NotificationGroupWithStatus: React.FC<{
+  icon: IconProp;
+  iconId: string;
+  statusId?: string;
+  actions?: JSX.Element;
+  count: number;
+  accountIds: string[];
+  timestamp: string;
+  labelRenderer: LabelRenderer;
+  labelSeeMoreHref?: string;
+  type: string;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  timestamp,
+  accountIds,
+  actions,
+  count,
+  statusId,
+  labelRenderer,
+  labelSeeMoreHref,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: (
+          <NamesList
+            accountIds={accountIds}
+            total={count}
+            seeMoreHref={labelSeeMoreHref}
+          />
+        ),
+      }),
+    [labelRenderer, accountIds, count, labelSeeMoreHref],
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-group focusable notification-group--${type}`,
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-group__icon'>
+        <Icon icon={icon} id={iconId} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__wrapper'>
+            <AvatarGroup accountIds={accountIds} />
+
+            {actions}
+          </div>
+
+          <div className='notification-group__main__header__label'>
+            {label}
+            {timestamp && <RelativeTimestamp timestamp={timestamp} />}
+          </div>
+        </div>
+
+        {statusId && (
+          <div className='notification-group__main__status'>
+            <EmbeddedStatus statusId={statusId} />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
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
new file mode 100644
index 0000000000..8d2d5a6282
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_mention.tsx
@@ -0,0 +1,55 @@
+import { FormattedMessage } from 'react-intl';
+
+import ReplyIcon from '@/material-icons/400-24px/reply-fill.svg?react';
+import type { StatusVisibility } from 'flavours/glitch/api_types/statuses';
+import type { NotificationGroupMention } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.mention'
+    defaultMessage='{name} mentioned you'
+    values={values}
+  />
+);
+
+const privateMentionLabelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.private_mention'
+    defaultMessage='{name} privately mentioned you'
+    values={values}
+  />
+);
+
+export const NotificationMention: React.FC<{
+  notification: NotificationGroupMention;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const statusVisibility = useAppSelector(
+    (state) =>
+      state.statuses.getIn([
+        notification.statusId,
+        'visibility',
+      ]) as StatusVisibility,
+  );
+
+  return (
+    <NotificationWithStatus
+      type='mention'
+      icon={ReplyIcon}
+      iconId='reply'
+      accountIds={notification.sampleAccountIds}
+      count={notification.notifications_count}
+      statusId={notification.statusId}
+      labelRenderer={
+        statusVisibility === 'direct'
+          ? privateMentionLabelRenderer
+          : labelRenderer
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
new file mode 100644
index 0000000000..6faf4c2a74
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_moderation_warning.tsx
@@ -0,0 +1,13 @@
+import { ModerationWarning } from 'flavours/glitch/features/notifications/components/moderation_warning';
+import type { NotificationGroupModerationWarning } from 'flavours/glitch/models/notification_group';
+
+export const NotificationModerationWarning: React.FC<{
+  notification: NotificationGroupModerationWarning;
+  unread: boolean;
+}> = ({ notification: { moderationWarning }, unread }) => (
+  <ModerationWarning
+    action={moderationWarning.action}
+    id={moderationWarning.id}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
new file mode 100644
index 0000000000..1e62a18483
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_poll.tsx
@@ -0,0 +1,41 @@
+import { FormattedMessage } from 'react-intl';
+
+import BarChart4BarsIcon from '@/material-icons/400-20px/bar_chart_4_bars.svg?react';
+import { me } from 'flavours/glitch/initial_state';
+import type { NotificationGroupPoll } from 'flavours/glitch/models/notification_group';
+
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRendererOther = () => (
+  <FormattedMessage
+    id='notification.poll'
+    defaultMessage='A poll you voted in has ended'
+  />
+);
+
+const labelRendererOwn = () => (
+  <FormattedMessage
+    id='notification.own_poll'
+    defaultMessage='Your poll has ended'
+  />
+);
+
+export const NotificationPoll: React.FC<{
+  notification: NotificationGroupPoll;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='poll'
+    icon={BarChart4BarsIcon}
+    iconId='bar-chart-4-bars'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={
+      notification.sampleAccountIds[0] === me
+        ? labelRendererOwn
+        : labelRendererOther
+    }
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
new file mode 100644
index 0000000000..0748b56c94
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_reblog.tsx
@@ -0,0 +1,45 @@
+import { FormattedMessage } from 'react-intl';
+
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import type { NotificationGroupReblog } from 'flavours/glitch/models/notification_group';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationGroupWithStatus } from './notification_group_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.reblog'
+    defaultMessage='{name} boosted your status'
+    values={values}
+  />
+);
+
+export const NotificationReblog: React.FC<{
+  notification: NotificationGroupReblog;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { statusId } = notification;
+  const statusAccount = useAppSelector(
+    (state) =>
+      state.accounts.get(state.statuses.getIn([statusId, 'account']) as string)
+        ?.acct,
+  );
+
+  return (
+    <NotificationGroupWithStatus
+      type='reblog'
+      icon={RepeatIcon}
+      iconId='repeat'
+      accountIds={notification.sampleAccountIds}
+      statusId={notification.statusId}
+      timestamp={notification.latest_page_notification_at}
+      count={notification.notifications_count}
+      labelRenderer={labelRenderer}
+      labelSeeMoreHref={
+        statusAccount ? `/@${statusAccount}/${statusId}/reblogs` : undefined
+      }
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
new file mode 100644
index 0000000000..9c2b0b3edb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_severed_relationships.tsx
@@ -0,0 +1,15 @@
+import { RelationshipsSeveranceEvent } from 'flavours/glitch/features/notifications/components/relationships_severance_event';
+import type { NotificationGroupSeveredRelationships } from 'flavours/glitch/models/notification_group';
+
+export const NotificationSeveredRelationships: React.FC<{
+  notification: NotificationGroupSeveredRelationships;
+  unread: boolean;
+}> = ({ notification: { event }, unread }) => (
+  <RelationshipsSeveranceEvent
+    type={event.type}
+    target={event.target_name}
+    followersCount={event.followers_count}
+    followingCount={event.following_count}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
new file mode 100644
index 0000000000..2d9944eb18
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_status.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
+import type { NotificationGroupStatus } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.status'
+    defaultMessage='{name} just posted'
+    values={values}
+  />
+);
+
+export const NotificationStatus: React.FC<{
+  notification: NotificationGroupStatus;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='status'
+    icon={NotificationsActiveIcon}
+    iconId='notifications-active'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
new file mode 100644
index 0000000000..6b9452a3eb
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_update.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupUpdate } from 'flavours/glitch/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (values) => (
+  <FormattedMessage
+    id='notification.update'
+    defaultMessage='{name} edited a post'
+    values={values}
+  />
+);
+
+export const NotificationUpdate: React.FC<{
+  notification: NotificationGroupUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
new file mode 100644
index 0000000000..8f94e09976
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/components/notification_with_status.tsx
@@ -0,0 +1,73 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { IconProp } from 'flavours/glitch/components/icon';
+import { Icon } from 'flavours/glitch/components/icon';
+import Status from 'flavours/glitch/containers/status_container';
+import { useAppSelector } from 'flavours/glitch/store';
+
+import { NamesList } from './names_list';
+import type { LabelRenderer } from './notification_group_with_status';
+
+export const NotificationWithStatus: React.FC<{
+  type: string;
+  icon: IconProp;
+  iconId: string;
+  accountIds: string[];
+  statusId: string;
+  count: number;
+  labelRenderer: LabelRenderer;
+  unread: boolean;
+}> = ({
+  icon,
+  iconId,
+  accountIds,
+  statusId,
+  count,
+  labelRenderer,
+  type,
+  unread,
+}) => {
+  const label = useMemo(
+    () =>
+      labelRenderer({
+        name: <NamesList accountIds={accountIds} total={count} />,
+      }),
+    [labelRenderer, accountIds, count],
+  );
+
+  const isPrivateMention = useAppSelector(
+    (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
+  );
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        `notification-ungrouped focusable notification-ungrouped--${type}`,
+        {
+          'notification-ungrouped--unread': unread,
+          'notification-ungrouped--direct': isPrivateMention,
+        },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-ungrouped__header'>
+        <div className='notification-ungrouped__header__icon'>
+          <Icon icon={icon} id={iconId} />
+        </div>
+        {label}
+      </div>
+
+      <Status
+        // @ts-expect-error -- <Status> is not yet typed
+        id={statusId}
+        contextType='notifications'
+        withDismiss
+        skipPrepend
+        avatarSize={40}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
new file mode 100644
index 0000000000..1299796662
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
@@ -0,0 +1,145 @@
+import type { PropsWithChildren } from 'react';
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
+import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { setNotificationsFilter } from 'flavours/glitch/actions/notification_groups';
+import { Icon } from 'flavours/glitch/components/icon';
+import {
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterAdvanced,
+} from 'flavours/glitch/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+
+const tooltips = defineMessages({
+  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
+  favourites: {
+    id: 'notifications.filter.favourites',
+    defaultMessage: 'Favorites',
+  },
+  boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' },
+  follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+  statuses: {
+    id: 'notifications.filter.statuses',
+    defaultMessage: 'Updates from people you follow',
+  },
+});
+
+const BarButton: React.FC<
+  PropsWithChildren<{
+    selectedFilter: string;
+    type: string;
+    title?: string;
+  }>
+> = ({ selectedFilter, type, title, children }) => {
+  const dispatch = useAppDispatch();
+
+  const onClick = useCallback(() => {
+    void dispatch(setNotificationsFilter({ filterType: type }));
+  }, [dispatch, type]);
+
+  return (
+    <button
+      className={selectedFilter === type ? 'active' : ''}
+      onClick={onClick}
+      title={title}
+    >
+      {children}
+    </button>
+  );
+};
+
+export const FilterBar: React.FC = () => {
+  const intl = useIntl();
+
+  const selectedFilter = useAppSelector(
+    selectSettingsNotificationsQuickFilterActive,
+  );
+  const advancedMode = useAppSelector(
+    selectSettingsNotificationsQuickFilterAdvanced,
+  );
+
+  if (advancedMode)
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='mention'
+          key='mention'
+          title={intl.formatMessage(tooltips.mentions)}
+        >
+          <Icon id='reply-all' icon={ReplyAllIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='favourite'
+          key='favourite'
+          title={intl.formatMessage(tooltips.favourites)}
+        >
+          <Icon id='star' icon={StarIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='reblog'
+          key='reblog'
+          title={intl.formatMessage(tooltips.boosts)}
+        >
+          <Icon id='retweet' icon={RepeatIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='poll'
+          key='poll'
+          title={intl.formatMessage(tooltips.polls)}
+        >
+          <Icon id='tasks' icon={InsertChartIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='status'
+          key='status'
+          title={intl.formatMessage(tooltips.statuses)}
+        >
+          <Icon id='home' icon={HomeIcon} />
+        </BarButton>
+        <BarButton
+          selectedFilter={selectedFilter}
+          type='follow'
+          key='follow'
+          title={intl.formatMessage(tooltips.follows)}
+        >
+          <Icon id='user-plus' icon={PersonAddIcon} />
+        </BarButton>
+      </div>
+    );
+  else
+    return (
+      <div className='notification__filter-bar'>
+        <BarButton selectedFilter={selectedFilter} type='all' key='all'>
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </BarButton>
+        <BarButton selectedFilter={selectedFilter} type='mention' key='mention'>
+          <FormattedMessage
+            id='notifications.filter.mentions'
+            defaultMessage='Mentions'
+          />
+        </BarButton>
+      </div>
+    );
+};
diff --git a/app/javascript/flavours/glitch/features/notifications_v2/index.tsx b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
new file mode 100644
index 0000000000..9405171375
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_v2/index.tsx
@@ -0,0 +1,354 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { createSelector } from '@reduxjs/toolkit';
+
+import { useDebouncedCallback } from 'use-debounce';
+
+import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
+import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
+import {
+  fetchNotificationsGap,
+  updateScrollPosition,
+  loadPending,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'flavours/glitch/actions/notification_groups';
+import { compareId } from 'flavours/glitch/compare_id';
+import { Icon } from 'flavours/glitch/components/icon';
+import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
+import { useIdentity } from 'flavours/glitch/identity_context';
+import type { NotificationGap } from 'flavours/glitch/reducers/notification_groups';
+import {
+  selectUnreadNotificationGroupsCount,
+  selectPendingNotificationGroupsCount,
+} from 'flavours/glitch/selectors/notifications';
+import {
+  selectNeedsNotificationPermission,
+  selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsQuickFilterActive,
+  selectSettingsNotificationsQuickFilterShow,
+  selectSettingsNotificationsShowUnread,
+} from 'flavours/glitch/selectors/settings';
+import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
+import type { RootState } from 'flavours/glitch/store';
+
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { submitMarkers } from '../../actions/markers';
+import Column from '../../components/column';
+import { ColumnHeader } from '../../components/column_header';
+import { LoadGap } from '../../components/load_gap';
+import ScrollableList from '../../components/scrollable_list';
+import { FilteredNotificationsBanner } from '../notifications/components/filtered_notifications_banner';
+import NotificationsPermissionBanner from '../notifications/components/notifications_permission_banner';
+import ColumnSettingsContainer from '../notifications/containers/column_settings_container';
+
+import { NotificationGroup } from './components/notification_group';
+import { FilterBar } from './filter_bar';
+
+const messages = defineMessages({
+  title: { id: 'column.notifications', defaultMessage: 'Notifications' },
+  markAsRead: {
+    id: 'notifications.mark_as_read',
+    defaultMessage: 'Mark every notification as read',
+  },
+});
+
+const getNotifications = createSelector(
+  [
+    selectSettingsNotificationsQuickFilterShow,
+    selectSettingsNotificationsQuickFilterActive,
+    selectSettingsNotificationsExcludedTypes,
+    (state: RootState) => state.notificationGroups.groups,
+  ],
+  (showFilterBar, allowedType, excludedTypes, notifications) => {
+    if (!showFilterBar || allowedType === 'all') {
+      // used if user changed the notification settings after loading the notifications from the server
+      // otherwise a list of notifications will come pre-filtered from the backend
+      // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+      return notifications.filter(
+        (item) => item.type === 'gap' || !excludedTypes.includes(item.type),
+      );
+    }
+    return notifications.filter(
+      (item) => item.type === 'gap' || allowedType === item.type,
+    );
+  },
+);
+
+export const Notifications: React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+}> = ({ columnId, multiColumn }) => {
+  const intl = useIntl();
+  const notifications = useAppSelector(getNotifications);
+  const dispatch = useAppDispatch();
+  const isLoading = useAppSelector((s) => s.notificationGroups.isLoading);
+  const hasMore = notifications.at(-1)?.type === 'gap';
+
+  const lastReadId = useAppSelector((s) =>
+    selectSettingsNotificationsShowUnread(s)
+      ? s.notificationGroups.lastReadId
+      : '0',
+  );
+
+  const numPending = useAppSelector(selectPendingNotificationGroupsCount);
+
+  const unreadNotificationsCount = useAppSelector(
+    selectUnreadNotificationGroupsCount,
+  );
+
+  const isUnread = unreadNotificationsCount > 0;
+
+  const canMarkAsRead =
+    useAppSelector(selectSettingsNotificationsShowUnread) &&
+    unreadNotificationsCount > 0;
+
+  const needsNotificationPermission = useAppSelector(
+    selectNeedsNotificationPermission,
+  );
+
+  const columnRef = useRef<Column>(null);
+
+  const selectChild = useCallback((index: number, alignTop: boolean) => {
+    const container = columnRef.current?.node as HTMLElement | undefined;
+
+    if (!container) return;
+
+    const element = container.querySelector<HTMLElement>(
+      `article:nth-of-type(${index + 1}) .focusable`,
+    );
+
+    if (element) {
+      if (alignTop && container.scrollTop > element.offsetTop) {
+        element.scrollIntoView(true);
+      } else if (
+        !alignTop &&
+        container.scrollTop + container.clientHeight <
+          element.offsetTop + element.offsetHeight
+      ) {
+        element.scrollIntoView(false);
+      }
+      element.focus();
+    }
+  }, []);
+
+  // Keep track of mounted components for unread notification handling
+  useEffect(() => {
+    dispatch(mountNotifications());
+
+    return () => {
+      dispatch(unmountNotifications());
+      dispatch(updateScrollPosition({ top: false }));
+    };
+  }, [dispatch]);
+
+  const handleLoadGap = useCallback(
+    (gap: NotificationGap) => {
+      void dispatch(fetchNotificationsGap({ gap }));
+    },
+    [dispatch],
+  );
+
+  const handleLoadOlder = useDebouncedCallback(
+    () => {
+      const gap = notifications.at(-1);
+      if (gap?.type === 'gap') void dispatch(fetchNotificationsGap({ gap }));
+    },
+    300,
+    { leading: true },
+  );
+
+  const handleLoadPending = useCallback(() => {
+    dispatch(loadPending());
+  }, [dispatch]);
+
+  const handleScrollToTop = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: true }));
+  }, 100);
+
+  const handleScroll = useDebouncedCallback(() => {
+    dispatch(updateScrollPosition({ top: false }));
+  }, 100);
+
+  useEffect(() => {
+    return () => {
+      handleLoadOlder.cancel();
+      handleScrollToTop.cancel();
+      handleScroll.cancel();
+    };
+  }, [handleLoadOlder, handleScrollToTop, handleScroll]);
+
+  const handlePin = useCallback(() => {
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('NOTIFICATIONS', {}));
+    }
+  }, [columnId, dispatch]);
+
+  const handleMove = useCallback(
+    (dir: unknown) => {
+      dispatch(moveColumn(columnId, dir));
+    },
+    [dispatch, columnId],
+  );
+
+  const handleHeaderClick = useCallback(() => {
+    columnRef.current?.scrollTop();
+  }, []);
+
+  const handleMoveUp = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) - 1;
+      selectChild(elementIndex, true);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMoveDown = useCallback(
+    (id: string) => {
+      const elementIndex =
+        notifications.findIndex(
+          (item) => item.type !== 'gap' && item.group_key === id,
+        ) + 1;
+      selectChild(elementIndex, false);
+    },
+    [notifications, selectChild],
+  );
+
+  const handleMarkAsRead = useCallback(() => {
+    dispatch(markNotificationsAsRead());
+    void dispatch(submitMarkers({ immediate: true }));
+  }, [dispatch]);
+
+  const pinned = !!columnId;
+  const emptyMessage = (
+    <FormattedMessage
+      id='empty_column.notifications'
+      defaultMessage="You don't have any notifications yet. When other people interact with you, you will see it here."
+    />
+  );
+
+  const { signedIn } = useIdentity();
+
+  const filterBar = signedIn ? <FilterBar /> : null;
+
+  const scrollableContent = useMemo(() => {
+    if (notifications.length === 0 && !hasMore) return null;
+
+    return notifications.map((item) =>
+      item.type === 'gap' ? (
+        <LoadGap
+          key={`${item.maxId}-${item.sinceId}`}
+          disabled={isLoading}
+          param={item}
+          onClick={handleLoadGap}
+        />
+      ) : (
+        <NotificationGroup
+          key={item.group_key}
+          notificationGroupId={item.group_key}
+          onMoveUp={handleMoveUp}
+          onMoveDown={handleMoveDown}
+          unread={
+            lastReadId !== '0' &&
+            !!item.page_max_id &&
+            compareId(item.page_max_id, lastReadId) > 0
+          }
+        />
+      ),
+    );
+  }, [
+    notifications,
+    isLoading,
+    hasMore,
+    lastReadId,
+    handleLoadGap,
+    handleMoveUp,
+    handleMoveDown,
+  ]);
+
+  const prepend = (
+    <>
+      {needsNotificationPermission && <NotificationsPermissionBanner />}
+      <FilteredNotificationsBanner />
+    </>
+  );
+
+  const scrollContainer = signedIn ? (
+    <ScrollableList
+      scrollKey={`notifications-${columnId}`}
+      trackScroll={!pinned}
+      isLoading={isLoading}
+      showLoading={isLoading && notifications.length === 0}
+      hasMore={hasMore}
+      numPending={numPending}
+      prepend={prepend}
+      alwaysPrepend
+      emptyMessage={emptyMessage}
+      onLoadMore={handleLoadOlder}
+      onLoadPending={handleLoadPending}
+      onScrollToTop={handleScrollToTop}
+      onScroll={handleScroll}
+      bindToDocument={!multiColumn}
+    >
+      {scrollableContent}
+    </ScrollableList>
+  ) : (
+    <NotSignedInIndicator />
+  );
+
+  const extraButton = canMarkAsRead ? (
+    <button
+      aria-label={intl.formatMessage(messages.markAsRead)}
+      title={intl.formatMessage(messages.markAsRead)}
+      onClick={handleMarkAsRead}
+      className='column-header__button'
+    >
+      <Icon id='done-all' icon={DoneAllIcon} />
+    </button>
+  ) : null;
+
+  return (
+    <Column
+      bindToDocument={!multiColumn}
+      ref={columnRef}
+      label={intl.formatMessage(messages.title)}
+    >
+      <ColumnHeader
+        icon='bell'
+        iconComponent={NotificationsIcon}
+        active={isUnread}
+        title={intl.formatMessage(messages.title)}
+        onPin={handlePin}
+        onMove={handleMove}
+        onClick={handleHeaderClick}
+        pinned={pinned}
+        multiColumn={multiColumn}
+        extraButton={extraButton}
+      >
+        <ColumnSettingsContainer />
+      </ColumnHeader>
+
+      {filterBar}
+
+      {scrollContainer}
+
+      <Helmet>
+        <title>{intl.formatMessage(messages.title)}</title>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default Notifications;
diff --git a/app/javascript/flavours/glitch/features/notifications_wrapper.jsx b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
new file mode 100644
index 0000000000..15ab3367cc
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/notifications_wrapper.jsx
@@ -0,0 +1,13 @@
+import Notifications from 'flavours/glitch/features/notifications';
+import Notifications_v2 from 'flavours/glitch/features/notifications_v2';
+import { useAppSelector } from 'flavours/glitch/store';
+
+export const NotificationsWrapper = (props) => {
+  const optedInGroupedNotifications = useAppSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
+
+  return (
+    optedInGroupedNotifications ? <Notifications_v2 {...props} /> : <Notifications {...props} />
+  );
+};
+
+export default NotificationsWrapper;
\ No newline at end of file
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 9166499c5a..e4c67ed65e 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.jsx
@@ -10,7 +10,7 @@ import { scrollRight } from '../../../scroll';
 import BundleContainer from '../containers/bundle_container';
 import {
   Compose,
-  Notifications,
+  NotificationsWrapper,
   HomeTimeline,
   CommunityTimeline,
   PublicTimeline,
@@ -32,7 +32,7 @@ import NavigationPanel from './navigation_panel';
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
+  'NOTIFICATIONS': NotificationsWrapper,
   'PUBLIC': PublicTimeline,
   'REMOTE': PublicTimeline,
   'COMMUNITY': CommunityTimeline,
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 98d82342cf..6153b3ceaa 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -33,6 +33,7 @@ import { NavigationPortal } from 'flavours/glitch/components/navigation_portal';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { timelinePreview, trendsEnabled } from 'flavours/glitch/initial_state';
 import { transientSingleColumn } from 'flavours/glitch/is_mobile';
+import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
 import ColumnLink from './column_link';
@@ -60,15 +61,19 @@ const messages = defineMessages({
 });
 
 const NotificationsLink = () => {
+  const optedInGroupedNotifications = useSelector((state) => state.getIn(['settings', 'notifications', 'groupingBeta'], false));
   const count = useSelector(state => state.getIn(['local_settings', 'notifications', 'tab_badge']) ? state.getIn(['notifications', 'unread']) : 0);
   const intl = useIntl();
 
+  const newCount = useSelector(selectUnreadNotificationGroupsCount);
+
   return (
     <ColumnLink
+      key='notifications'
       transparent
       to='/notifications'
-      icon={<IconWithBadge id='bell' icon={NotificationsIcon} count={count} className='column-link__icon' />}
-      activeIcon={<IconWithBadge id='bell' icon={NotificationsActiveIcon} count={count} className='column-link__icon' />}
+      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' />}
       text={intl.formatMessage(messages.notifications)}
     />
   );
diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx
index 221f789a31..7a2aa21f88 100644
--- a/app/javascript/flavours/glitch/features/ui/index.jsx
+++ b/app/javascript/flavours/glitch/features/ui/index.jsx
@@ -12,8 +12,9 @@ import Favico from 'favico.js';
 import { debounce } from 'lodash';
 import { HotKeys } from 'react-hotkeys';
 
-import { changeLayout } from 'flavours/glitch/actions/app';
+import { focusApp, unfocusApp, changeLayout } from 'flavours/glitch/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
+import { initializeNotifications } from 'flavours/glitch/actions/notifications_migration';
 import { INTRODUCTION_VERSION } from 'flavours/glitch/actions/onboarding';
 import { HoverCardController } from 'flavours/glitch/components/hover_card_controller';
 import { Permalink } from 'flavours/glitch/components/permalink';
@@ -24,7 +25,7 @@ import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
-import { expandNotifications, notificationsSetVisibility } from '../../actions/notifications';
+import { notificationsSetVisibility } from '../../actions/notifications';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
 import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
@@ -51,7 +52,7 @@ import {
   Favourites,
   DirectTimeline,
   HashtagTimeline,
-  Notifications,
+  NotificationsWrapper,
   NotificationRequests,
   NotificationRequest,
   FollowRequests,
@@ -74,6 +75,7 @@ import {
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
+
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
@@ -214,7 +216,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
             <WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
             <WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
-            <WrappedRoute path='/notifications' component={Notifications} content={children} exact />
+            <WrappedRoute path='/notifications' component={NotificationsWrapper} content={children} exact />
             <WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
             <WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
             <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
@@ -304,7 +306,10 @@ class UI extends PureComponent {
     const visibility = !document[this.visibilityHiddenProp];
     this.props.dispatch(notificationsSetVisibility(visibility));
     if (visibility) {
+      this.props.dispatch(focusApp());
       this.props.dispatch(submitMarkers({ immediate: true }));
+    } else {
+      this.props.dispatch(unfocusApp());
     }
   };
 
@@ -419,7 +424,7 @@ class UI extends PureComponent {
     if (signedIn) {
       this.props.dispatch(fetchMarkers());
       this.props.dispatch(expandHomeTimeline());
-      this.props.dispatch(expandNotifications());
+      this.props.dispatch(initializeNotifications());
       this.props.dispatch(fetchServerTranslationLanguages());
 
       setTimeout(() => this.props.dispatch(fetchServer()), 3000);
diff --git a/app/javascript/flavours/glitch/features/ui/util/async-components.js b/app/javascript/flavours/glitch/features/ui/util/async-components.js
index a312cefff7..e334e1a3b6 100644
--- a/app/javascript/flavours/glitch/features/ui/util/async-components.js
+++ b/app/javascript/flavours/glitch/features/ui/util/async-components.js
@@ -7,7 +7,15 @@ export function Compose () {
 }
 
 export function Notifications () {
-  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'../../notifications');
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications_v1" */'../../notifications');
+}
+
+export function Notifications_v2 () {
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications_v2" */'../../notifications_v2');
+}
+
+export function NotificationsWrapper () {
+  return import(/* webpackChunkName: "flavours/glitch/async/notifications" */'../../notifications_wrapper');
 }
 
 export function HomeTimeline () {
diff --git a/app/javascript/flavours/glitch/models/notification_group.ts b/app/javascript/flavours/glitch/models/notification_group.ts
new file mode 100644
index 0000000000..6c8b8eb6e3
--- /dev/null
+++ b/app/javascript/flavours/glitch/models/notification_group.ts
@@ -0,0 +1,207 @@
+import type {
+  ApiAccountRelationshipSeveranceEventJSON,
+  ApiAccountWarningJSON,
+  BaseNotificationGroupJSON,
+  ApiNotificationGroupJSON,
+  ApiNotificationJSON,
+  NotificationType,
+  NotificationWithStatusType,
+} from 'flavours/glitch/api_types/notifications';
+import type { ApiReportJSON } from 'flavours/glitch/api_types/reports';
+
+// Maximum number of avatars displayed in a notification group
+// This corresponds to the max lenght of `group.sampleAccountIds`
+export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
+
+interface BaseNotificationGroup
+  extends Omit<BaseNotificationGroupJSON, 'sample_accounts'> {
+  sampleAccountIds: string[];
+}
+
+interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
+  extends BaseNotificationGroup {
+  type: Type;
+  statusId: string;
+}
+
+interface BaseNotification<Type extends NotificationType>
+  extends BaseNotificationGroup {
+  type: Type;
+}
+
+export type NotificationGroupFavourite =
+  BaseNotificationWithStatus<'favourite'>;
+export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
+export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
+export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
+export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
+export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupFollow = BaseNotification<'follow'>;
+export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
+export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
+
+export type AccountWarningAction =
+  | 'none'
+  | 'disable'
+  | 'mark_statuses_as_sensitive'
+  | 'delete_statuses'
+  | 'sensitive'
+  | 'silence'
+  | 'suspend';
+export interface AccountWarning
+  extends Omit<ApiAccountWarningJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupModerationWarning
+  extends BaseNotification<'moderation_warning'> {
+  moderationWarning: AccountWarning;
+}
+
+type AccountRelationshipSeveranceEvent =
+  ApiAccountRelationshipSeveranceEventJSON;
+export interface NotificationGroupSeveredRelationships
+  extends BaseNotification<'severed_relationships'> {
+  event: AccountRelationshipSeveranceEvent;
+}
+
+interface Report extends Omit<ApiReportJSON, 'target_account'> {
+  targetAccountId: string;
+}
+
+export interface NotificationGroupAdminReport
+  extends BaseNotification<'admin.report'> {
+  report: Report;
+}
+
+export type NotificationGroup =
+  | NotificationGroupFavourite
+  | NotificationGroupReblog
+  | NotificationGroupStatus
+  | NotificationGroupMention
+  | NotificationGroupPoll
+  | NotificationGroupUpdate
+  | NotificationGroupFollow
+  | NotificationGroupFollowRequest
+  | NotificationGroupModerationWarning
+  | NotificationGroupSeveredRelationships
+  | NotificationGroupAdminSignUp
+  | NotificationGroupAdminReport;
+
+function createReportFromJSON(reportJSON: ApiReportJSON): Report {
+  const { target_account, ...report } = reportJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...report,
+  };
+}
+
+function createAccountWarningFromJSON(
+  warningJSON: ApiAccountWarningJSON,
+): AccountWarning {
+  const { target_account, ...warning } = warningJSON;
+  return {
+    targetAccountId: target_account.id,
+    ...warning,
+  };
+}
+
+function createAccountRelationshipSeveranceEventFromJSON(
+  eventJson: ApiAccountRelationshipSeveranceEventJSON,
+): AccountRelationshipSeveranceEvent {
+  return eventJson;
+}
+
+export function createNotificationGroupFromJSON(
+  groupJson: ApiNotificationGroupJSON,
+): NotificationGroup {
+  const { sample_accounts, ...group } = groupJson;
+  const sampleAccountIds = sample_accounts.map((account) => account.id);
+
+  switch (group.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update': {
+      const { status, ...groupWithoutStatus } = group;
+      return {
+        statusId: status.id,
+        sampleAccountIds,
+        ...groupWithoutStatus,
+      };
+    }
+    case 'admin.report': {
+      const { report, ...groupWithoutTargetAccount } = group;
+      return {
+        report: createReportFromJSON(report),
+        sampleAccountIds,
+        ...groupWithoutTargetAccount,
+      };
+    }
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(group.event),
+        sampleAccountIds,
+      };
+
+    case 'moderation_warning': {
+      const { moderation_warning, ...groupWithoutModerationWarning } = group;
+      return {
+        ...groupWithoutModerationWarning,
+        moderationWarning: createAccountWarningFromJSON(moderation_warning),
+        sampleAccountIds,
+      };
+    }
+    default:
+      return {
+        sampleAccountIds,
+        ...group,
+      };
+  }
+}
+
+export function createNotificationGroupFromNotificationJSON(
+  notification: ApiNotificationJSON,
+) {
+  const group = {
+    sampleAccountIds: [notification.account.id],
+    group_key: notification.group_key,
+    notifications_count: 1,
+    type: notification.type,
+    most_recent_notification_id: notification.id,
+    page_min_id: notification.id,
+    page_max_id: notification.id,
+    latest_page_notification_at: notification.created_at,
+  } as NotificationGroup;
+
+  switch (notification.type) {
+    case 'favourite':
+    case 'reblog':
+    case 'status':
+    case 'mention':
+    case 'poll':
+    case 'update':
+      return { ...group, statusId: notification.status.id };
+    case 'admin.report':
+      return { ...group, report: createReportFromJSON(notification.report) };
+    case 'severed_relationships':
+      return {
+        ...group,
+        event: createAccountRelationshipSeveranceEventFromJSON(
+          notification.event,
+        ),
+      };
+    case 'moderation_warning':
+      return {
+        ...group,
+        moderationWarning: createAccountWarningFromJSON(
+          notification.moderation_warning,
+        ),
+      };
+    default:
+      return group;
+  }
+}
diff --git a/app/javascript/flavours/glitch/reducers/index.ts b/app/javascript/flavours/glitch/reducers/index.ts
index 3fee5818f9..d8d50be7d2 100644
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -25,6 +25,7 @@ import { markersReducer } from './markers';
 import media_attachments from './media_attachments';
 import meta from './meta';
 import { modalReducer } from './modal';
+import { notificationGroupsReducer } from './notification_groups';
 import { notificationPolicyReducer } from './notification_policy';
 import { notificationRequestsReducer } from './notification_requests';
 import notifications from './notifications';
@@ -68,6 +69,7 @@ const reducers = {
   search,
   media_attachments,
   notifications,
+  notificationGroups: notificationGroupsReducer,
   height_cache,
   custom_emojis,
   lists,
diff --git a/app/javascript/flavours/glitch/reducers/markers.ts b/app/javascript/flavours/glitch/reducers/markers.ts
index 380e9d3995..8b997e47be 100644
--- a/app/javascript/flavours/glitch/reducers/markers.ts
+++ b/app/javascript/flavours/glitch/reducers/markers.ts
@@ -1,6 +1,10 @@
 import { createReducer } from '@reduxjs/toolkit';
 
-import { submitMarkersAction } from 'flavours/glitch/actions/markers';
+import {
+  submitMarkersAction,
+  fetchMarkers,
+} from 'flavours/glitch/actions/markers';
+import { compareId } from 'flavours/glitch/compare_id';
 
 const initialState = {
   home: '0',
@@ -15,4 +19,23 @@ export const markersReducer = createReducer(initialState, (builder) => {
       if (notifications) state.notifications = notifications;
     },
   );
+  builder.addCase(
+    fetchMarkers.fulfilled,
+    (
+      state,
+      {
+        payload: {
+          markers: { home, notifications },
+        },
+      },
+    ) => {
+      if (home && compareId(home.last_read_id, state.home) > 0)
+        state.home = home.last_read_id;
+      if (
+        notifications &&
+        compareId(notifications.last_read_id, state.notifications) > 0
+      )
+        state.notifications = notifications.last_read_id;
+    },
+  );
 });
diff --git a/app/javascript/flavours/glitch/reducers/notification_groups.ts b/app/javascript/flavours/glitch/reducers/notification_groups.ts
new file mode 100644
index 0000000000..b0b284b696
--- /dev/null
+++ b/app/javascript/flavours/glitch/reducers/notification_groups.ts
@@ -0,0 +1,508 @@
+import { createReducer, isAnyOf } from '@reduxjs/toolkit';
+
+import {
+  authorizeFollowRequestSuccess,
+  blockAccountSuccess,
+  muteAccountSuccess,
+  rejectFollowRequestSuccess,
+} from 'flavours/glitch/actions/accounts_typed';
+import { focusApp, unfocusApp } from 'flavours/glitch/actions/app';
+import { blockDomainSuccess } from 'flavours/glitch/actions/domain_blocks_typed';
+import { fetchMarkers } from 'flavours/glitch/actions/markers';
+import {
+  clearNotifications,
+  fetchNotifications,
+  fetchNotificationsGap,
+  processNewNotificationForGroups,
+  loadPending,
+  updateScrollPosition,
+  markNotificationsAsRead,
+  mountNotifications,
+  unmountNotifications,
+} from 'flavours/glitch/actions/notification_groups';
+import {
+  disconnectTimeline,
+  timelineDelete,
+} from 'flavours/glitch/actions/timelines_typed';
+import type { ApiNotificationJSON } from 'flavours/glitch/api_types/notifications';
+import { compareId } from 'flavours/glitch/compare_id';
+import { usePendingItems } from 'flavours/glitch/initial_state';
+import {
+  NOTIFICATIONS_GROUP_MAX_AVATARS,
+  createNotificationGroupFromJSON,
+  createNotificationGroupFromNotificationJSON,
+} from 'flavours/glitch/models/notification_group';
+import type { NotificationGroup } from 'flavours/glitch/models/notification_group';
+
+const NOTIFICATIONS_TRIM_LIMIT = 50;
+
+export interface NotificationGap {
+  type: 'gap';
+  maxId?: string;
+  sinceId?: string;
+}
+
+interface NotificationGroupsState {
+  groups: (NotificationGroup | NotificationGap)[];
+  pendingGroups: (NotificationGroup | NotificationGap)[];
+  scrolledToTop: boolean;
+  isLoading: boolean;
+  lastReadId: string;
+  mounted: number;
+  isTabVisible: boolean;
+}
+
+const initialState: NotificationGroupsState = {
+  groups: [],
+  pendingGroups: [], // holds pending groups in slow mode
+  scrolledToTop: false,
+  isLoading: false,
+  // The following properties are used to track unread notifications
+  lastReadId: '0', // used for unread notifications
+  mounted: 0, // number of mounted notification list components, usually 0 or 1
+  isTabVisible: true,
+};
+
+function filterNotificationsForAccounts(
+  groups: NotificationGroupsState['groups'],
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  groups = groups
+    .map((group) => {
+      if (
+        group.type !== 'gap' &&
+        (!onlyForType || group.type === onlyForType)
+      ) {
+        const previousLength = group.sampleAccountIds.length;
+
+        group.sampleAccountIds = group.sampleAccountIds.filter(
+          (id) => !accountIds.includes(id),
+        );
+
+        const newLength = group.sampleAccountIds.length;
+        const removed = previousLength - newLength;
+
+        group.notifications_count -= removed;
+      }
+
+      return group;
+    })
+    .filter(
+      (group) => group.type === 'gap' || group.sampleAccountIds.length > 0,
+    );
+  mergeGaps(groups);
+  return groups;
+}
+
+function filterNotificationsForStatus(
+  groups: NotificationGroupsState['groups'],
+  statusId: string,
+) {
+  groups = groups.filter(
+    (group) =>
+      group.type === 'gap' ||
+      !('statusId' in group) ||
+      group.statusId !== statusId,
+  );
+  mergeGaps(groups);
+  return groups;
+}
+
+function removeNotificationsForAccounts(
+  state: NotificationGroupsState,
+  accountIds: string[],
+  onlyForType?: string,
+) {
+  state.groups = filterNotificationsForAccounts(
+    state.groups,
+    accountIds,
+    onlyForType,
+  );
+  state.pendingGroups = filterNotificationsForAccounts(
+    state.pendingGroups,
+    accountIds,
+    onlyForType,
+  );
+}
+
+function removeNotificationsForStatus(
+  state: NotificationGroupsState,
+  statusId: string,
+) {
+  state.groups = filterNotificationsForStatus(state.groups, statusId);
+  state.pendingGroups = filterNotificationsForStatus(
+    state.pendingGroups,
+    statusId,
+  );
+}
+
+function isNotificationGroup(
+  groupOrGap: NotificationGroup | NotificationGap,
+): groupOrGap is NotificationGroup {
+  return groupOrGap.type !== 'gap';
+}
+
+// Merge adjacent gaps in `groups` in-place
+function mergeGaps(groups: NotificationGroupsState['groups']) {
+  for (let i = 0; i < groups.length; i++) {
+    const firstGroupOrGap = groups[i];
+
+    if (firstGroupOrGap?.type === 'gap') {
+      let lastGap = firstGroupOrGap;
+      let j = i + 1;
+
+      for (; j < groups.length; j++) {
+        const groupOrGap = groups[j];
+        if (groupOrGap?.type === 'gap') lastGap = groupOrGap;
+        else break;
+      }
+
+      if (j - i > 1) {
+        groups.splice(i, j - i, {
+          type: 'gap',
+          maxId: firstGroupOrGap.maxId,
+          sinceId: lastGap.sinceId,
+        });
+      }
+    }
+  }
+}
+
+// Checks if `groups[index-1]` and `groups[index]` are gaps, and merge them in-place if they are
+function mergeGapsAround(
+  groups: NotificationGroupsState['groups'],
+  index: number,
+) {
+  if (index > 0) {
+    const potentialFirstGap = groups[index - 1];
+    const potentialSecondGap = groups[index];
+
+    if (
+      potentialFirstGap?.type === 'gap' &&
+      potentialSecondGap?.type === 'gap'
+    ) {
+      groups.splice(index - 1, 2, {
+        type: 'gap',
+        maxId: potentialFirstGap.maxId,
+        sinceId: potentialSecondGap.sinceId,
+      });
+    }
+  }
+}
+
+function processNewNotification(
+  groups: NotificationGroupsState['groups'],
+  notification: ApiNotificationJSON,
+) {
+  const existingGroupIndex = groups.findIndex(
+    (group) =>
+      group.type !== 'gap' && group.group_key === notification.group_key,
+  );
+
+  // In any case, we are going to add a group at the top
+  // If there is currently a gap at the top, now is the time to update it
+  if (groups.length > 0 && groups[0]?.type === 'gap') {
+    groups[0].maxId = notification.id;
+  }
+
+  if (existingGroupIndex > -1) {
+    const existingGroup = groups[existingGroupIndex];
+
+    if (
+      existingGroup &&
+      existingGroup.type !== 'gap' &&
+      !existingGroup.sampleAccountIds.includes(notification.account.id) // This can happen for example if you like, then unlike, then like again the same post
+    ) {
+      // Update the existing group
+      if (
+        existingGroup.sampleAccountIds.unshift(notification.account.id) >
+        NOTIFICATIONS_GROUP_MAX_AVATARS
+      )
+        existingGroup.sampleAccountIds.pop();
+
+      existingGroup.most_recent_notification_id = notification.id;
+      existingGroup.page_max_id = notification.id;
+      existingGroup.latest_page_notification_at = notification.created_at;
+      existingGroup.notifications_count += 1;
+
+      groups.splice(existingGroupIndex, 1);
+      mergeGapsAround(groups, existingGroupIndex);
+
+      groups.unshift(existingGroup);
+    }
+  } else {
+    // Create a new group
+    groups.unshift(createNotificationGroupFromNotificationJSON(notification));
+  }
+}
+
+function trimNotifications(state: NotificationGroupsState) {
+  if (state.scrolledToTop) {
+    state.groups.splice(NOTIFICATIONS_TRIM_LIMIT);
+  }
+}
+
+function shouldMarkNewNotificationsAsRead(
+  {
+    isTabVisible,
+    scrolledToTop,
+    mounted,
+    lastReadId,
+    groups,
+  }: NotificationGroupsState,
+  ignoreScroll = false,
+) {
+  const isMounted = mounted > 0;
+  const oldestGroup = groups.findLast(isNotificationGroup);
+  const hasMore = groups.at(-1)?.type === 'gap';
+  const oldestGroupReached =
+    !hasMore ||
+    lastReadId === '0' ||
+    (oldestGroup?.page_min_id &&
+      compareId(oldestGroup.page_min_id, lastReadId) <= 0);
+
+  return (
+    isTabVisible &&
+    (ignoreScroll || scrolledToTop) &&
+    isMounted &&
+    oldestGroupReached
+  );
+}
+
+function updateLastReadId(
+  state: NotificationGroupsState,
+  group: NotificationGroup | undefined = undefined,
+) {
+  if (shouldMarkNewNotificationsAsRead(state)) {
+    group = group ?? state.groups.find(isNotificationGroup);
+    if (
+      group?.page_max_id &&
+      compareId(state.lastReadId, group.page_max_id) < 0
+    )
+      state.lastReadId = group.page_max_id;
+  }
+}
+
+export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
+  initialState,
+  (builder) => {
+    builder
+      .addCase(fetchNotifications.fulfilled, (state, action) => {
+        state.groups = action.payload.map((json) =>
+          json.type === 'gap' ? json : createNotificationGroupFromJSON(json),
+        );
+        state.isLoading = false;
+        updateLastReadId(state);
+      })
+      .addCase(fetchNotificationsGap.fulfilled, (state, action) => {
+        const { notifications } = action.payload;
+
+        // find the gap in the existing notifications
+        const gapIndex = state.groups.findIndex(
+          (groupOrGap) =>
+            groupOrGap.type === 'gap' &&
+            groupOrGap.sinceId === action.meta.arg.gap.sinceId &&
+            groupOrGap.maxId === action.meta.arg.gap.maxId,
+        );
+
+        if (gapIndex < 0)
+          // We do not know where to insert, let's return
+          return;
+
+        // Filling a disconnection gap means we're getting historical data
+        // about groups we may know or may not know about.
+
+        // The notifications timeline is split in two by the gap, with
+        // group information newer than the gap, and group information older
+        // than the gap.
+
+        // Filling a gap should not touch anything before the gap, so any
+        // information on groups already appearing before the gap should be
+        // discarded, while any information on groups appearing after the gap
+        // can be updated and re-ordered.
+
+        const oldestPageNotification = notifications.at(-1)?.page_min_id;
+
+        // replace the gap with the notifications + a new gap
+
+        const newerGroupKeys = state.groups
+          .slice(0, gapIndex)
+          .filter(isNotificationGroup)
+          .map((group) => group.group_key);
+
+        const toInsert: NotificationGroupsState['groups'] = notifications
+          .map((json) => createNotificationGroupFromJSON(json))
+          .filter(
+            (notification) => !newerGroupKeys.includes(notification.group_key),
+          );
+
+        const apiGroupKeys = (toInsert as NotificationGroup[]).map(
+          (group) => group.group_key,
+        );
+
+        const sinceId = action.meta.arg.gap.sinceId;
+        if (
+          notifications.length > 0 &&
+          !(
+            oldestPageNotification &&
+            sinceId &&
+            compareId(oldestPageNotification, sinceId) <= 0
+          )
+        ) {
+          // If we get an empty page, it means we reached the bottom, so we do not need to insert a new gap
+          // Similarly, if we've fetched more than the gap's, this means we have completely filled it
+          toInsert.push({
+            type: 'gap',
+            maxId: notifications.at(-1)?.page_max_id,
+            sinceId,
+          } as NotificationGap);
+        }
+
+        // Remove older groups covered by the API
+        state.groups = state.groups.filter(
+          (groupOrGap) =>
+            groupOrGap.type !== 'gap' &&
+            !apiGroupKeys.includes(groupOrGap.group_key),
+        );
+
+        // Replace the gap with API results (+ the new gap if needed)
+        state.groups.splice(gapIndex, 1, ...toInsert);
+
+        // Finally, merge any adjacent gaps that could have been created by filtering
+        // groups earlier
+        mergeGaps(state.groups);
+
+        state.isLoading = false;
+
+        updateLastReadId(state);
+      })
+      .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
+        const notification = action.payload;
+        processNewNotification(
+          usePendingItems ? state.pendingGroups : state.groups,
+          notification,
+        );
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(disconnectTimeline, (state, action) => {
+        if (action.payload.timeline === 'home') {
+          if (state.groups.length > 0 && state.groups[0]?.type !== 'gap') {
+            state.groups.unshift({
+              type: 'gap',
+              sinceId: state.groups[0]?.page_min_id,
+            });
+          }
+        }
+      })
+      .addCase(timelineDelete, (state, action) => {
+        removeNotificationsForStatus(state, action.payload.statusId);
+      })
+      .addCase(clearNotifications.pending, (state) => {
+        state.groups = [];
+        state.pendingGroups = [];
+      })
+      .addCase(blockAccountSuccess, (state, action) => {
+        removeNotificationsForAccounts(state, [action.payload.relationship.id]);
+      })
+      .addCase(muteAccountSuccess, (state, action) => {
+        if (action.payload.relationship.muting_notifications)
+          removeNotificationsForAccounts(state, [
+            action.payload.relationship.id,
+          ]);
+      })
+      .addCase(blockDomainSuccess, (state, action) => {
+        removeNotificationsForAccounts(
+          state,
+          action.payload.accounts.map((account) => account.id),
+        );
+      })
+      .addCase(loadPending, (state) => {
+        // First, remove any existing group and merge data
+        state.pendingGroups.forEach((group) => {
+          if (group.type !== 'gap') {
+            const existingGroupIndex = state.groups.findIndex(
+              (groupOrGap) =>
+                isNotificationGroup(groupOrGap) &&
+                groupOrGap.group_key === group.group_key,
+            );
+            if (existingGroupIndex > -1) {
+              const existingGroup = state.groups[existingGroupIndex];
+              if (existingGroup && existingGroup.type !== 'gap') {
+                group.notifications_count += existingGroup.notifications_count;
+                group.sampleAccountIds = group.sampleAccountIds
+                  .concat(existingGroup.sampleAccountIds)
+                  .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
+                state.groups.splice(existingGroupIndex, 1);
+              }
+            }
+          }
+          trimNotifications(state);
+        });
+
+        // Then build the consolidated list and clear pending groups
+        state.groups = state.pendingGroups.concat(state.groups);
+        state.pendingGroups = [];
+      })
+      .addCase(updateScrollPosition, (state, action) => {
+        state.scrolledToTop = action.payload.top;
+        updateLastReadId(state);
+        trimNotifications(state);
+      })
+      .addCase(markNotificationsAsRead, (state) => {
+        const mostRecentGroup = state.groups.find(isNotificationGroup);
+        if (
+          mostRecentGroup?.page_max_id &&
+          compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
+        )
+          state.lastReadId = mostRecentGroup.page_max_id;
+      })
+      .addCase(fetchMarkers.fulfilled, (state, action) => {
+        if (
+          action.payload.markers.notifications &&
+          compareId(
+            state.lastReadId,
+            action.payload.markers.notifications.last_read_id,
+          ) < 0
+        )
+          state.lastReadId = action.payload.markers.notifications.last_read_id;
+      })
+      .addCase(mountNotifications, (state) => {
+        state.mounted += 1;
+        updateLastReadId(state);
+      })
+      .addCase(unmountNotifications, (state) => {
+        state.mounted -= 1;
+      })
+      .addCase(focusApp, (state) => {
+        state.isTabVisible = true;
+        updateLastReadId(state);
+      })
+      .addCase(unfocusApp, (state) => {
+        state.isTabVisible = false;
+      })
+      .addMatcher(
+        isAnyOf(authorizeFollowRequestSuccess, rejectFollowRequestSuccess),
+        (state, action) => {
+          removeNotificationsForAccounts(
+            state,
+            [action.payload.id],
+            'follow_request',
+          );
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.pending, fetchNotificationsGap.pending),
+        (state) => {
+          state.isLoading = true;
+        },
+      )
+      .addMatcher(
+        isAnyOf(fetchNotifications.rejected, fetchNotificationsGap.rejected),
+        (state) => {
+          state.isLoading = false;
+        },
+      );
+  },
+);
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index 226f2affe1..b3c138583c 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -12,6 +12,7 @@ import {
 import {
   fetchMarkers,
 } from '../actions/markers';
+import { clearNotifications } from '../actions/notification_groups';
 import {
   NOTIFICATIONS_MOUNT,
   NOTIFICATIONS_UNMOUNT,
@@ -21,7 +22,6 @@ import {
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
   NOTIFICATIONS_FILTER_SET,
-  NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
   NOTIFICATIONS_LOAD_PENDING,
   NOTIFICATIONS_DELETE_MARKED_REQUEST,
@@ -332,7 +332,7 @@ export default function notifications(state = initialState, action) {
   case authorizeFollowRequestSuccess.type:
   case rejectFollowRequestSuccess.type:
     return filterNotifications(state, [action.payload.id], 'follow_request');
-  case NOTIFICATIONS_CLEAR:
+  case clearNotifications.pending.type:
     return state.set('items', ImmutableList()).set('pendingItems', ImmutableList()).set('hasMore', false);
   case timelineDelete.type:
     return deleteByStatus(state, action.payload.statusId);
diff --git a/app/javascript/flavours/glitch/selectors/notifications.ts b/app/javascript/flavours/glitch/selectors/notifications.ts
new file mode 100644
index 0000000000..7cc64aa6c5
--- /dev/null
+++ b/app/javascript/flavours/glitch/selectors/notifications.ts
@@ -0,0 +1,34 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import { compareId } from 'flavours/glitch/compare_id';
+import type { RootState } from 'flavours/glitch/store';
+
+export const selectUnreadNotificationGroupsCount = createSelector(
+  [
+    (s: RootState) => s.notificationGroups.lastReadId,
+    (s: RootState) => s.notificationGroups.pendingGroups,
+    (s: RootState) => s.notificationGroups.groups,
+  ],
+  (notificationMarker, pendingGroups, groups) => {
+    return (
+      groups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length +
+      pendingGroups.filter(
+        (group) =>
+          group.type !== 'gap' &&
+          group.page_max_id &&
+          compareId(group.page_max_id, notificationMarker) > 0,
+      ).length
+    );
+  },
+);
+
+export const selectPendingNotificationGroupsCount = createSelector(
+  [(s: RootState) => s.notificationGroups.pendingGroups],
+  (pendingGroups) =>
+    pendingGroups.filter((group) => group.type !== 'gap').length,
+);
diff --git a/app/javascript/flavours/glitch/selectors/settings.ts b/app/javascript/flavours/glitch/selectors/settings.ts
new file mode 100644
index 0000000000..ce2b8b15e5
--- /dev/null
+++ b/app/javascript/flavours/glitch/selectors/settings.ts
@@ -0,0 +1,40 @@
+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 selectSettingsNotificationsExcludedTypes = (state: RootState) =>
+  Object.entries(selectSettingsNotificationsShows(state))
+    .filter(([_type, enabled]) => !enabled)
+    .map(([type, _enabled]) => type);
+
+export const selectSettingsNotificationsQuickFilterShow = (state: RootState) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'show']) as boolean;
+
+export const selectSettingsNotificationsQuickFilterActive = (
+  state: RootState,
+) => state.settings.getIn(['notifications', 'quickFilter', 'active']) as string;
+
+export const selectSettingsNotificationsQuickFilterAdvanced = (
+  state: RootState,
+) =>
+  state.settings.getIn(['notifications', 'quickFilter', 'advanced']) as boolean;
+
+export const selectSettingsNotificationsShowUnread = (state: RootState) =>
+  state.settings.getIn(['notifications', 'showUnread']) as boolean;
+
+export const selectNeedsNotificationPermission = (state: RootState) =>
+  (state.settings.getIn(['notifications', 'alerts']).includes(true) &&
+    state.notifications.get('browserSupport') &&
+    state.notifications.get('browserPermission') === 'default' &&
+    !state.settings.getIn([
+      'notifications',
+      'dismissPermissionBanner',
+    ])) as boolean;
+
+/* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */
diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 06225b61e6..bcc3655155 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -1790,10 +1790,19 @@ body > [data-popper-placement] {
   }
 }
 
-.status__wrapper-direct {
+.status__wrapper-direct,
+.notification-ungrouped--direct {
   background: rgba($ui-highlight-color, 0.05);
 
-  .status__prepend {
+  &:focus {
+    background: rgba($ui-highlight-color, 0.1);
+  }
+}
+
+.status__wrapper-direct,
+.notification-ungrouped--direct {
+  .status__prepend,
+  .notification-ungrouped__header {
     color: $highlight-text-color;
   }
 }
@@ -2389,41 +2398,28 @@ a.account__display-name {
   }
 }
 
-.notification__relationships-severance-event,
-.notification__moderation-warning {
-  display: flex;
-  gap: 16px;
+.notification-group--link {
   color: $secondary-text-color;
   text-decoration: none;
-  align-items: flex-start;
-  padding: 16px 32px;
-  border-bottom: 1px solid var(--background-border-color);
 
-  &:hover {
-    color: $primary-text-color;
-  }
-
-  .icon {
-    padding: 2px;
-    color: $highlight-text-color;
-  }
-
-  &__content {
+  .notification-group__main {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     gap: 8px;
     flex-grow: 1;
-    font-size: 16px;
-    line-height: 24px;
+    font-size: 15px;
+    line-height: 22px;
 
-    strong {
+    strong,
+    bdi {
       font-weight: 700;
     }
 
     .link-button {
       font-size: inherit;
       line-height: inherit;
+      font-weight: inherit;
     }
   }
 }
@@ -10747,8 +10743,8 @@ noscript {
   display: flex;
   align-items: center;
   border-bottom: 1px solid var(--background-border-color);
-  padding: 24px 32px;
-  gap: 16px;
+  padding: 16px 24px;
+  gap: 8px;
   color: $darker-text-color;
   text-decoration: none;
 
@@ -10758,10 +10754,8 @@ noscript {
     color: $secondary-text-color;
   }
 
-  .icon {
-    width: 24px;
-    height: 24px;
-    padding: 2px;
+  .notification-group__icon {
+    color: inherit;
   }
 
   &__text {
@@ -10899,6 +10893,251 @@ noscript {
   }
 }
 
+.notification-group {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 10px 14px; // glitch: reduced padding
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__icon {
+    width: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 0 0 auto;
+    color: $dark-text-color;
+
+    .icon {
+      width: 28px;
+      height: 28px;
+    }
+  }
+
+  &--follow &__icon,
+  &--follow-request &__icon {
+    color: $highlight-text-color;
+  }
+
+  &--favourite &__icon {
+    color: $gold-star;
+  }
+
+  &--reblog &__icon {
+    color: $valid-value-color;
+  }
+
+  &--relationships-severance-event &__icon,
+  &--admin-report &__icon,
+  &--admin-sign-up &__icon {
+    color: $dark-text-color;
+  }
+
+  &--moderation-warning &__icon {
+    color: $red-bookmark;
+  }
+
+  &--follow-request &__actions {
+    align-items: center;
+    display: flex;
+    gap: 8px;
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 50%;
+      padding: 1px;
+    }
+  }
+
+  &__main {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    flex: 1 1 auto;
+    overflow: hidden;
+
+    &__header {
+      display: flex;
+      flex-direction: column;
+      gap: 8px;
+
+      &__wrapper {
+        display: flex;
+        justify-content: space-between;
+      }
+
+      &__label {
+        display: flex;
+        gap: 8px;
+        font-size: 15px;
+        line-height: 22px;
+        color: $darker-text-color;
+
+        a {
+          color: inherit;
+          text-decoration: none;
+        }
+
+        bdi {
+          font-weight: 700;
+          color: $primary-text-color;
+        }
+
+        time {
+          color: $dark-text-color;
+        }
+      }
+    }
+
+    &__status {
+      border: 1px solid var(--background-border-color);
+      border-radius: 8px;
+      padding: 8px;
+    }
+  }
+
+  &__avatar-group {
+    display: flex;
+    gap: 8px;
+    height: 28px;
+    overflow-y: hidden;
+    flex-wrap: wrap;
+  }
+
+  .status {
+    padding: 0;
+    border: 0;
+  }
+
+  &__embedded-status {
+    &__account {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-bottom: 8px;
+      color: $dark-text-color;
+
+      bdi {
+        color: inherit;
+      }
+    }
+
+    .account__avatar {
+      opacity: 0.5;
+    }
+
+    &__content {
+      display: -webkit-box;
+      font-size: 15px;
+      line-height: 22px;
+      color: $dark-text-color;
+      cursor: pointer;
+      -webkit-line-clamp: 4;
+      -webkit-box-orient: vertical;
+      max-height: 4 * 22px;
+      overflow: hidden;
+
+      p,
+      a {
+        color: inherit;
+      }
+    }
+  }
+}
+
+.notification-ungrouped {
+  padding: 16px 24px;
+  border-bottom: 1px solid var(--background-border-color);
+
+  &__header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    color: $dark-text-color;
+    font-size: 15px;
+    line-height: 22px;
+    font-weight: 500;
+    padding-inline-start: 24px;
+    margin-bottom: 16px;
+
+    &__icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex: 0 0 auto;
+
+      .icon {
+        width: 16px;
+        height: 16px;
+      }
+    }
+
+    a {
+      color: inherit;
+      text-decoration: none;
+    }
+  }
+
+  .status {
+    border: 0;
+    padding: 0;
+
+    &__avatar {
+      width: 40px;
+      height: 40px;
+    }
+  }
+
+  .status__wrapper-direct {
+    background: transparent;
+  }
+
+  $icon-margin: 48px; // 40px avatar + 8px gap
+
+  .status__content,
+  .status__action-bar,
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .picture-in-picture-placeholder,
+  .more-from-author,
+  .status-card,
+  .hashtag-bar {
+    margin-inline-start: $icon-margin;
+    width: calc(100% - $icon-margin);
+  }
+
+  .more-from-author {
+    width: calc(100% - $icon-margin + 2px);
+  }
+
+  .status__content__read-more-button {
+    margin-inline-start: $icon-margin;
+  }
+
+  .notification__report {
+    border: 0;
+    padding: 0;
+  }
+}
+
+.notification-group--unread,
+.notification-ungrouped--unread {
+  position: relative;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    inset-inline-start: 0;
+    width: 100%;
+    height: 100%;
+    border-inline-start: 4px solid $highlight-text-color;
+    pointer-events: none;
+  }
+}
+
 .hover-card-controller[data-popper-reference-hidden='true'] {
   opacity: 0;
   pointer-events: none;